Mercurial > vim

comparison src/configure.ac @ 28045:e14b45572104 v8.2.4547

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.4547: the neXTaw GUI is old and does not work well Commit: https://github.com/vim/vim/commit/f52fac2ed94e6acc9612103c6c6f55660cc695c8 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Mar 11 16:01:26 2022 +0000 patch 8.2.4547: the neXTaw GUI is old and does not work well Problem: The neXTaw GUI is old and does not work well. Solution: Remove the neXTaw GUI from configure to find out who still wants support for this GUI.
author Bram Moolenaar <Bram@vim.org>
date Fri, 11 Mar 2022 17:15:04 +0100
parents 6970b2533bfc
children 6312a35b254a
comparison
equal deleted inserted replaced
28044:b070f094f7a9 28045:e14b45572104
2441 2441
2442 test "x$with_x" = xno -a "x$HAIKU" != "xyes" -a "x$MACOS_X" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no 2442 test "x$with_x" = xno -a "x$HAIKU" != "xyes" -a "x$MACOS_X" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no
2443 2443
2444 AC_MSG_CHECKING(--enable-gui argument) 2444 AC_MSG_CHECKING(--enable-gui argument)
2445 AC_ARG_ENABLE(gui, 2445 AC_ARG_ENABLE(gui,
2446 [ --enable-gui[=OPTS] X11 GUI. [default=auto] [OPTS=auto/no/gtk2/gnome2/gtk3/motif/neXtaw/haiku/photon/carbon]], , enable_gui="auto") 2446 [ --enable-gui[=OPTS] X11 GUI. [default=auto] [OPTS=auto/no/gtk2/gnome2/gtk3/motif/haiku/photon/carbon]], , enable_gui="auto")
2447 2447
2448 dnl Canonicalize the --enable-gui= argument so that it can be easily compared. 2448 dnl Canonicalize the --enable-gui= argument so that it can be easily compared.
2449 dnl Do not use character classes for portability with old tools. 2449 dnl Do not use character classes for portability with old tools.
2450 enable_gui_canon=`echo "_$enable_gui" | \ 2450 enable_gui_canon=`echo "_$enable_gui" | \
2451 sed 's/[[ _+-]]//g;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` 2451 sed 's/[[ _+-]]//g;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
2453 dnl Skip everything by default. 2453 dnl Skip everything by default.
2454 SKIP_GTK2=YES 2454 SKIP_GTK2=YES
2455 SKIP_GTK3=YES 2455 SKIP_GTK3=YES
2456 SKIP_GNOME=YES 2456 SKIP_GNOME=YES
2457 SKIP_MOTIF=YES 2457 SKIP_MOTIF=YES
2458 SKIP_NEXTAW=YES
2459 SKIP_PHOTON=YES 2458 SKIP_PHOTON=YES
2460 SKIP_HAIKU=YES 2459 SKIP_HAIKU=YES
2461 GUITYPE=NONE 2460 GUITYPE=NONE
2462 2461
2463 if test "x$HAIKU" = "xyes"; then 2462 if test "x$HAIKU" = "xyes"; then
2498 yes|""|auto) AC_MSG_RESULT(yes/auto - automatic GUI support) 2497 yes|""|auto) AC_MSG_RESULT(yes/auto - automatic GUI support)
2499 gui_auto=yes 2498 gui_auto=yes
2500 SKIP_GTK2= 2499 SKIP_GTK2=
2501 SKIP_GTK3= 2500 SKIP_GTK3=
2502 SKIP_GNOME= 2501 SKIP_GNOME=
2503 SKIP_MOTIF= 2502 SKIP_MOTIF=;;
2504 SKIP_NEXTAW=;;
2505 gtk2) AC_MSG_RESULT(GTK+ 2.x GUI support) 2503 gtk2) AC_MSG_RESULT(GTK+ 2.x GUI support)
2506 SKIP_GTK2=;; 2504 SKIP_GTK2=;;
2507 gnome2) AC_MSG_RESULT(GNOME 2.x GUI support) 2505 gnome2) AC_MSG_RESULT(GNOME 2.x GUI support)
2508 SKIP_GNOME= 2506 SKIP_GNOME=
2509 SKIP_GTK2=;; 2507 SKIP_GTK2=;;
2510 gtk3) AC_MSG_RESULT(GTK+ 3.x GUI support) 2508 gtk3) AC_MSG_RESULT(GTK+ 3.x GUI support)
2511 SKIP_GTK3=;; 2509 SKIP_GTK3=;;
2512 motif) AC_MSG_RESULT(Motif GUI support) 2510 motif) AC_MSG_RESULT(Motif GUI support)
2513 SKIP_MOTIF=;; 2511 SKIP_MOTIF=;;
2514 nextaw) AC_MSG_RESULT(neXtaw GUI support)
2515 SKIP_NEXTAW=;;
2516 *) AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported]) ;; 2512 *) AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported]) ;;
2517 esac 2513 esac
2518 2514
2519 fi 2515 fi
2520 2516
2559 [ --enable-motif-check If auto-select GUI, check for Motif [default=yes]], 2555 [ --enable-motif-check If auto-select GUI, check for Motif [default=yes]],
2560 , enable_motif_check="yes") 2556 , enable_motif_check="yes")
2561 AC_MSG_RESULT($enable_motif_check) 2557 AC_MSG_RESULT($enable_motif_check)
2562 if test "x$enable_motif_check" = "xno"; then 2558 if test "x$enable_motif_check" = "xno"; then
2563 SKIP_MOTIF=YES 2559 SKIP_MOTIF=YES
2564 fi
2565 fi
2566
2567 if test "x$SKIP_NEXTAW" != "xYES" -a "$enable_gui_canon" != "nextaw"; then
2568 AC_MSG_CHECKING(whether or not to look for neXtaw)
2569 AC_ARG_ENABLE(nextaw-check,
2570 [ --enable-nextaw-check If auto-select GUI, check for neXtaw [default=yes]],
2571 , enable_nextaw_check="yes")
2572 AC_MSG_RESULT($enable_nextaw_check);
2573 if test "x$enable_nextaw_check" = "xno"; then
2574 SKIP_NEXTAW=YES
2575 fi 2560 fi
2576 fi 2561 fi
2577 2562
2578 dnl define an autoconf function to check for a specified version of GTK, and 2563 dnl define an autoconf function to check for a specified version of GTK, and
2579 dnl try to compile/link a GTK program. 2564 dnl try to compile/link a GTK program.
2804 [GUI_LIB_LOC="$GTK_LIBDIR" 2789 [GUI_LIB_LOC="$GTK_LIBDIR"
2805 GTK_LIBNAME="$GTK_LIBS" 2790 GTK_LIBNAME="$GTK_LIBS"
2806 GUI_INC_LOC="$GTK_CFLAGS"], ) 2791 GUI_INC_LOC="$GTK_CFLAGS"], )
2807 if test "x$GTK_CFLAGS" != "x"; then 2792 if test "x$GTK_CFLAGS" != "x"; then
2808 SKIP_GTK3=YES 2793 SKIP_GTK3=YES
2809 SKIP_NEXTAW=YES
2810 SKIP_MOTIF=YES 2794 SKIP_MOTIF=YES
2811 GUITYPE=GTK 2795 GUITYPE=GTK
2812 AC_SUBST(GTK_LIBNAME) 2796 AC_SUBST(GTK_LIBNAME)
2813 else 2797 else
2814 SKIP_GTK3=$save_skip_gtk3 2798 SKIP_GTK3=$save_skip_gtk3
2854 GTK_LIBNAME="$GTK_LIBS" 2838 GTK_LIBNAME="$GTK_LIBS"
2855 GUI_INC_LOC="$GTK_CFLAGS"], ) 2839 GUI_INC_LOC="$GTK_CFLAGS"], )
2856 if test "x$GTK_CFLAGS" != "x"; then 2840 if test "x$GTK_CFLAGS" != "x"; then
2857 SKIP_GTK2=YES 2841 SKIP_GTK2=YES
2858 SKIP_GNOME=YES 2842 SKIP_GNOME=YES
2859 SKIP_NEXTAW=YES
2860 SKIP_MOTIF=YES 2843 SKIP_MOTIF=YES
2861 GUITYPE=GTK 2844 GUITYPE=GTK
2862 AC_SUBST(GTK_LIBNAME) 2845 AC_SUBST(GTK_LIBNAME)
2863 AC_DEFINE(USE_GTK3) 2846 AC_DEFINE(USE_GTK3)
2864 else 2847 else
3015 fi 2998 fi
3016 fi 2999 fi
3017 fi 3000 fi
3018 3001
3019 if test -z "$SKIP_MOTIF"; then 3002 if test -z "$SKIP_MOTIF"; then
3020 SKIP_NEXTAW=YES
3021 GUITYPE=MOTIF 3003 GUITYPE=MOTIF
3022 AC_SUBST(MOTIF_LIBNAME) 3004 AC_SUBST(MOTIF_LIBNAME)
3023 fi 3005 fi
3024 3006
3025 if test -z "$SKIP_NEXTAW"; then 3007 if -z "$SKIP_MOTIF"; then
3026 AC_MSG_CHECKING(if neXtaw header files can be found)
3027 cflags_save=$CFLAGS
3028 CFLAGS="$CFLAGS $X_CFLAGS"
3029 AC_TRY_COMPILE([
3030 #include <X11/Intrinsic.h>
3031 #include <X11/neXtaw/Paned.h>], ,
3032 AC_MSG_RESULT(yes),
3033 AC_MSG_RESULT(no); SKIP_NEXTAW=YES )
3034 CFLAGS=$cflags_save
3035 fi
3036
3037 if test -z "$SKIP_NEXTAW"; then
3038 GUITYPE=NEXTAW
3039 fi
3040
3041 if test -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then
3042 dnl Prepend -I and -L to $GUI_INC_LOC and $GUI_LIB_LOC if not empty 3008 dnl Prepend -I and -L to $GUI_INC_LOC and $GUI_LIB_LOC if not empty
3043 dnl Avoid adding it when it twice 3009 dnl Avoid adding it when it twice
3044 if test -n "$GUI_INC_LOC"; then 3010 if test -n "$GUI_INC_LOC"; then
3045 GUI_INC_LOC=-I"`echo $GUI_INC_LOC|sed 's%-I%%'`" 3011 GUI_INC_LOC=-I"`echo $GUI_INC_LOC|sed 's%-I%%'`"
3046 fi 3012 fi
3098 AC_CHECK_HEADERS(X11/SM/SMlib.h) 3064 AC_CHECK_HEADERS(X11/SM/SMlib.h)
3099 CPPFLAGS=$cppflags_save 3065 CPPFLAGS=$cppflags_save
3100 fi 3066 fi
3101 3067
3102 3068
3103 if test -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF" -o -z "$SKIP_GTK2" -o -z "$SKIP_GTK3"; then 3069 if test -z "$SKIP_MOTIF" -o -z "$SKIP_GTK2" -o -z "$SKIP_GTK3"; then
3104 dnl Check for X11/xpm.h and X11/Sunkeysym.h with the GUI include path 3070 dnl Check for X11/xpm.h and X11/Sunkeysym.h with the GUI include path
3105 cppflags_save=$CPPFLAGS 3071 cppflags_save=$CPPFLAGS
3106 CPPFLAGS="$CPPFLAGS $X_CFLAGS" 3072 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
3107 AC_CHECK_HEADERS(X11/xpm.h X11/Sunkeysym.h) 3073 AC_CHECK_HEADERS(X11/xpm.h X11/Sunkeysym.h)
3108 3074
3120 AC_MSG_RESULT(X GUI selected; xim has been enabled) 3086 AC_MSG_RESULT(X GUI selected; xim has been enabled)
3121 enable_xim="yes" 3087 enable_xim="yes"
3122 fi 3088 fi
3123 fi 3089 fi
3124 3090
3125 if test -z "$SKIP_NEXTAW" -o -z "$SKIP_MOTIF"; then 3091 if test -z "$SKIP_MOTIF"; then
3126 cppflags_save=$CPPFLAGS 3092 cppflags_save=$CPPFLAGS
3127 CPPFLAGS="$CPPFLAGS $X_CFLAGS" 3093 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
3128 dnl Xmu/Editres.h may exist but can only be used after including Intrinsic.h 3094 dnl Xmu/Editres.h may exist but can only be used after including Intrinsic.h
3129 AC_MSG_CHECKING([for X11/Xmu/Editres.h]) 3095 AC_MSG_CHECKING([for X11/Xmu/Editres.h])
3130 AC_TRY_COMPILE([ 3096 AC_TRY_COMPILE([