Mercurial > vim

comparison src/configure.ac @ 19526:22f0dda71638 v8.2.0320

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.0320: no Haiku support Commit: https://github.com/vim/vim/commit/b3f740695a0199d22cd97aee314f06c7ae32d2ea Author: Bram Moolenaar <Bram@vim.org> Date: Wed Feb 26 16:16:53 2020 +0100 patch 8.2.0320: no Haiku support Problem: No Haiku support. Solution: Add support for Haiku. (Emir Sari, closes https://github.com/vim/vim/issues/5605)
author Bram Moolenaar <Bram@vim.org>
date Wed, 26 Feb 2020 16:30:04 +0100
parents 224fb493b72c
children e373843e2980
comparison
equal deleted inserted replaced
19525:619eb9bc3249 19526:22f0dda71638
150 AC_MSG_CHECKING(for BeOS) 150 AC_MSG_CHECKING(for BeOS)
151 case `uname` in 151 case `uname` in
152 BeOS) OS_EXTRA_SRC=os_beos.c; OS_EXTRA_OBJ=objects/os_beos.o 152 BeOS) OS_EXTRA_SRC=os_beos.c; OS_EXTRA_OBJ=objects/os_beos.o
153 BEOS=yes; AC_MSG_RESULT(yes);; 153 BEOS=yes; AC_MSG_RESULT(yes);;
154 *) BEOS=no; AC_MSG_RESULT(no);; 154 *) BEOS=no; AC_MSG_RESULT(no);;
155 esac
156
157 AC_MSG_CHECKING(for Haiku)
158 case `uname` in
159 Haiku) HAIKU=yes; AC_MSG_RESULT(yes);;
160 *) HAIKU=no; AC_MSG_RESULT(no);;
155 esac 161 esac
156 162
157 dnl If QNX is found, assume we don't want to use Xphoton 163 dnl If QNX is found, assume we don't want to use Xphoton
158 dnl unless it was specifically asked for (--with-x) 164 dnl unless it was specifically asked for (--with-x)
159 AC_MSG_CHECKING(for QNX) 165 AC_MSG_CHECKING(for QNX)
2031 fi 2037 fi
2032 fi 2038 fi
2033 2039
2034 if test "$enable_channel" = "yes"; then 2040 if test "$enable_channel" = "yes"; then
2035 dnl On Solaris we need the socket and nsl library. 2041 dnl On Solaris we need the socket and nsl library.
2036 AC_CHECK_LIB(socket, socket) 2042
2043 if test "x$HAIKU" = "xyes"; then
2044 AC_CHECK_LIB(network, socket)
2045 else
2046 AC_CHECK_LIB(socket, socket)
2047 fi
2048
2037 AC_CHECK_LIB(nsl, gethostbyname) 2049 AC_CHECK_LIB(nsl, gethostbyname)
2038 AC_MSG_CHECKING(whether compiling with process communication is possible) 2050 AC_MSG_CHECKING(whether compiling with process communication is possible)
2039 AC_TRY_LINK([ 2051 AC_TRY_LINK([
2040 #include <stdio.h> 2052 #include <stdio.h>
2041 #include <stdlib.h> 2053 #include <stdlib.h>
2309 dnl Check if --with-x was given but it doesn't work. 2321 dnl Check if --with-x was given but it doesn't work.
2310 if test "x$with_x" = xno -a "x$with_x_arg" = xyes; then 2322 if test "x$with_x" = xno -a "x$with_x_arg" = xyes; then
2311 AC_MSG_ERROR([could not configure X]) 2323 AC_MSG_ERROR([could not configure X])
2312 fi 2324 fi
2313 2325
2314 test "x$with_x" = xno -a "x$MACOS_X" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no 2326 test "x$with_x" = xno -a "x$HAIKU" != "xyes" -a "x$MACOS_X" != "xyes" -a "x$QNX" != "xyes" && enable_gui=no
2315 2327
2316 AC_MSG_CHECKING(--enable-gui argument) 2328 AC_MSG_CHECKING(--enable-gui argument)
2317 AC_ARG_ENABLE(gui, 2329 AC_ARG_ENABLE(gui,
2318 [ --enable-gui[=OPTS] X11 GUI. [default=auto] [OPTS=auto/no/gtk2/gnome2/gtk3/motif/athena/neXtaw/photon/carbon]], , enable_gui="auto") 2330 [ --enable-gui[=OPTS] X11 GUI. [default=auto] [OPTS=auto/no/gtk2/gnome2/gtk3/motif/athena/neXtaw/haiku/photon/carbon]], , enable_gui="auto")
2319 2331
2320 dnl Canonicalize the --enable-gui= argument so that it can be easily compared. 2332 dnl Canonicalize the --enable-gui= argument so that it can be easily compared.
2321 dnl Do not use character classes for portability with old tools. 2333 dnl Do not use character classes for portability with old tools.
2322 enable_gui_canon=`echo "_$enable_gui" | \ 2334 enable_gui_canon=`echo "_$enable_gui" | \
2323 sed 's/[[ _+-]]//g;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'` 2335 sed 's/[[ _+-]]//g;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
2328 SKIP_GNOME=YES 2340 SKIP_GNOME=YES
2329 SKIP_MOTIF=YES 2341 SKIP_MOTIF=YES
2330 SKIP_ATHENA=YES 2342 SKIP_ATHENA=YES
2331 SKIP_NEXTAW=YES 2343 SKIP_NEXTAW=YES
2332 SKIP_PHOTON=YES 2344 SKIP_PHOTON=YES
2345 SKIP_HAIKU=YES
2333 SKIP_CARBON=YES 2346 SKIP_CARBON=YES
2334 GUITYPE=NONE 2347 GUITYPE=NONE
2335 2348
2336 if test "x$QNX" = "xyes" -a "x$with_x" = "xno" ; then 2349 if test "x$HAIKU" = "xyes"; then
2350 SKIP_HAIKU=
2351 case "$enable_gui_canon" in
2352 no) AC_MSG_RESULT(no GUI support)
2353 SKIP_HAIKU=YES ;;
2354 yes|"") AC_MSG_RESULT(yes - automatic GUI support) ;;
2355 auto) AC_MSG_RESULT(auto - automatic GUI support) ;;
2356 haiku) AC_MSG_RESULT(Haiku GUI support) ;;
2357 *) AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported])
2358 SKIP_HAIKU=YES ;;
2359 esac
2360 elif test "x$QNX" = "xyes" -a "x$with_x" = "xno" ; then
2337 SKIP_PHOTON= 2361 SKIP_PHOTON=
2338 case "$enable_gui_canon" in 2362 case "$enable_gui_canon" in
2339 no) AC_MSG_RESULT(no GUI support) 2363 no) AC_MSG_RESULT(no GUI support)
2340 SKIP_PHOTON=YES ;; 2364 SKIP_PHOTON=YES ;;
2341 yes|""|auto) AC_MSG_RESULT(automatic GUI support) 2365 yes|""|auto) AC_MSG_RESULT(automatic GUI support)
2497 SKIP_GNOME=YES; 2521 SKIP_GNOME=YES;
2498 SKIP_MOTIF=YES; 2522 SKIP_MOTIF=YES;
2499 SKIP_ATHENA=YES; 2523 SKIP_ATHENA=YES;
2500 SKIP_NEXTAW=YES; 2524 SKIP_NEXTAW=YES;
2501 SKIP_PHOTON=YES; 2525 SKIP_PHOTON=YES;
2526 SKIP_HAIKU=YES;
2502 SKIP_CARBON=YES 2527 SKIP_CARBON=YES
2503 fi 2528 fi
2504 2529
2505 dnl define an autoconf function to check for a specified version of GTK, and 2530 dnl define an autoconf function to check for a specified version of GTK, and
2506 dnl try to compile/link a GTK program. 2531 dnl try to compile/link a GTK program.
3108 enable_fontset="no" 3133 enable_fontset="no"
3109 fi 3134 fi
3110 if test "x$GUITYPE:$enable_fontset" = "xGTK:yes"; then 3135 if test "x$GUITYPE:$enable_fontset" = "xGTK:yes"; then
3111 AC_MSG_RESULT(GTK+ 2 GUI selected; fontset has been disabled) 3136 AC_MSG_RESULT(GTK+ 2 GUI selected; fontset has been disabled)
3112 enable_fontset="no" 3137 enable_fontset="no"
3138 fi
3139
3140 dnl There is no test for the Haiku GUI, if it's selected it's used
3141 if test -z "$SKIP_HAIKU"; then
3142 GUITYPE=HAIKUGUI
3113 fi 3143 fi
3114 3144
3115 if test -z "$SKIP_PHOTON"; then 3145 if test -z "$SKIP_PHOTON"; then
3116 GUITYPE=PHOTONGUI 3146 GUITYPE=PHOTONGUI
3117 fi 3147 fi