Mercurial > vim

comparison src/configure.ac @ 30645:101f08b49ed3 v9.0.0657

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.0657: too many #ifdefs Commit: https://github.com/vim/vim/commit/7904fa420eb577274c4c3711295240100167d495 Author: Martin Tournoij <martin@arp242.net> Date: Tue Oct 4 16:28:45 2022 +0100 patch 9.0.0657: too many #ifdefs Problem: Too many #ifdefs. Solution: Graduate the +cmdwin feature. Now the tiny and small builds are equal, drop the small build. (Martin Tournoij, closes #11268)
author Bram Moolenaar <Bram@vim.org>
date Tue, 04 Oct 2022 17:30:06 +0200
parents 425b686c5244
children 71137f73c94d
comparison
equal deleted inserted replaced
30644:0c102a723b9a 30645:101f08b49ed3
520 fi 520 fi
521 521
522 dnl Check user requested features. 522 dnl Check user requested features.
523 523
524 AC_MSG_CHECKING(--with-features argument) 524 AC_MSG_CHECKING(--with-features argument)
525 AC_ARG_WITH(features, [ --with-features=TYPE tiny, small, normal, big or huge (default: huge)], 525 AC_ARG_WITH(features, [ --with-features=TYPE tiny, normal, big or huge (default: huge)],
526 features="$withval"; AC_MSG_RESULT($features), 526 features="$withval"; AC_MSG_RESULT($features),
527 features="huge"; AC_MSG_RESULT(Defaulting to huge)) 527 features="huge"; AC_MSG_RESULT(Defaulting to huge))
528
529 dnl "small" is supported for backwards compatibility, now an alias for "tiny"
530 case "$features" in
531 small) features="tiny" ;;
532 esac
528 533
529 dovimdiff="" 534 dovimdiff=""
530 dogvimdiff="" 535 dogvimdiff=""
531 case "$features" in 536 case "$features" in
532 tiny) AC_DEFINE(FEAT_TINY) ;; 537 tiny) AC_DEFINE(FEAT_TINY) ;;
533 small) AC_DEFINE(FEAT_SMALL) ;;
534 normal) AC_DEFINE(FEAT_NORMAL) dovimdiff="installvimdiff"; 538 normal) AC_DEFINE(FEAT_NORMAL) dovimdiff="installvimdiff";
535 dogvimdiff="installgvimdiff" ;; 539 dogvimdiff="installgvimdiff" ;;
536 big) AC_DEFINE(FEAT_BIG) dovimdiff="installvimdiff"; 540 big) AC_DEFINE(FEAT_BIG) dovimdiff="installvimdiff";
537 dogvimdiff="installgvimdiff" ;; 541 dogvimdiff="installgvimdiff" ;;
538 huge) AC_DEFINE(FEAT_HUGE) dovimdiff="installvimdiff"; 542 huge) AC_DEFINE(FEAT_HUGE) dovimdiff="installvimdiff";
541 esac 545 esac
542 546
543 AC_SUBST(dovimdiff) 547 AC_SUBST(dovimdiff)
544 AC_SUBST(dogvimdiff) 548 AC_SUBST(dogvimdiff)
545 549
546 if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then 550 if test "x$features" = "xtiny"; then
547 has_eval=no 551 has_eval=no
548 else 552 else
549 has_eval=yes 553 has_eval=yes
550 fi 554 fi
551 555
575 else 579 else
576 AC_MSG_RESULT(yes) 580 AC_MSG_RESULT(yes)
577 fi 581 fi
578 582
579 AC_MSG_CHECKING([diff feature]) 583 AC_MSG_CHECKING([diff feature])
580 if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then 584 if test "x$features" = "xtiny"; then
581 AC_MSG_RESULT([disabled in $features version]) 585 AC_MSG_RESULT([disabled in $features version])
582 else 586 else
583 AC_MSG_RESULT(enabled) 587 AC_MSG_RESULT(enabled)
584 AC_DEFINE(FEAT_DIFF) 588 AC_DEFINE(FEAT_DIFF)
585 XDIFF_OBJS_USED="\$(XDIFF_OBJS)" 589 XDIFF_OBJS_USED="\$(XDIFF_OBJS)"
593 [enable_luainterp="no"]) 597 [enable_luainterp="no"])
594 AC_MSG_RESULT($enable_luainterp) 598 AC_MSG_RESULT($enable_luainterp)
595 599
596 if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then 600 if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
597 if test "$has_eval" = "no"; then 601 if test "$has_eval" = "no"; then
598 AC_MSG_ERROR([cannot use Lua with tiny or small features]) 602 AC_MSG_ERROR([cannot use Lua with tiny features])
599 fi 603 fi
600 604
601 dnl -- find the lua executable 605 dnl -- find the lua executable
602 AC_SUBST(vi_cv_path_lua) 606 AC_SUBST(vi_cv_path_lua)
603 607
1080 [ --enable-perlinterp[=OPTS] Include Perl interpreter. [default=no] [OPTS=no/yes/dynamic]], , 1084 [ --enable-perlinterp[=OPTS] Include Perl interpreter. [default=no] [OPTS=no/yes/dynamic]], ,
1081 [enable_perlinterp="no"]) 1085 [enable_perlinterp="no"])
1082 AC_MSG_RESULT($enable_perlinterp) 1086 AC_MSG_RESULT($enable_perlinterp)
1083 if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then 1087 if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then
1084 if test "$has_eval" = "no"; then 1088 if test "$has_eval" = "no"; then
1085 AC_MSG_ERROR([cannot use Perl with tiny or small features]) 1089 AC_MSG_ERROR([cannot use Perl with tiny features])
1086 fi 1090 fi
1087 AC_SUBST(vi_cv_path_perl) 1091 AC_SUBST(vi_cv_path_perl)
1088 AC_PATH_PROG(vi_cv_path_perl, perl) 1092 AC_PATH_PROG(vi_cv_path_perl, perl)
1089 if test "X$vi_cv_path_perl" != "X"; then 1093 if test "X$vi_cv_path_perl" != "X"; then
1090 AC_MSG_CHECKING(Perl version) 1094 AC_MSG_CHECKING(Perl version)
1229 [ --enable-pythoninterp[=OPTS] Include Python interpreter. [default=no] [OPTS=no/yes/dynamic]], , 1233 [ --enable-pythoninterp[=OPTS] Include Python interpreter. [default=no] [OPTS=no/yes/dynamic]], ,
1230 [enable_pythoninterp="no"]) 1234 [enable_pythoninterp="no"])
1231 AC_MSG_RESULT($enable_pythoninterp) 1235 AC_MSG_RESULT($enable_pythoninterp)
1232 if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then 1236 if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
1233 if test "$has_eval" = "no"; then 1237 if test "$has_eval" = "no"; then
1234 AC_MSG_ERROR([cannot use Python with tiny or small features]) 1238 AC_MSG_ERROR([cannot use Python with tiny features])
1235 fi 1239 fi
1236 1240
1237 dnl -- find the python executable 1241 dnl -- find the python executable
1238 AC_MSG_CHECKING(--with-python-command argument) 1242 AC_MSG_CHECKING(--with-python-command argument)
1239 AC_SUBST(vi_cv_path_python) 1243 AC_SUBST(vi_cv_path_python)
1464 [ --enable-python3interp[=OPTS] Include Python3 interpreter. [default=no] [OPTS=no/yes/dynamic]], , 1468 [ --enable-python3interp[=OPTS] Include Python3 interpreter. [default=no] [OPTS=no/yes/dynamic]], ,
1465 [enable_python3interp="no"]) 1469 [enable_python3interp="no"])
1466 AC_MSG_RESULT($enable_python3interp) 1470 AC_MSG_RESULT($enable_python3interp)
1467 if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then 1471 if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
1468 if test "$has_eval" = "no"; then 1472 if test "$has_eval" = "no"; then
1469 AC_MSG_ERROR([cannot use Python with tiny or small features]) 1473 AC_MSG_ERROR([cannot use Python with tiny features])
1470 fi 1474 fi
1471 1475
1472 dnl -- find the python3 executable 1476 dnl -- find the python3 executable
1473 AC_MSG_CHECKING(--with-python3-command argument) 1477 AC_MSG_CHECKING(--with-python3-command argument)
1474 AC_SUBST(vi_cv_path_python3) 1478 AC_SUBST(vi_cv_path_python3)
1977 [ --enable-rubyinterp[=OPTS] Include Ruby interpreter. [default=no] [OPTS=no/yes/dynamic]], , 1981 [ --enable-rubyinterp[=OPTS] Include Ruby interpreter. [default=no] [OPTS=no/yes/dynamic]], ,
1978 [enable_rubyinterp="no"]) 1982 [enable_rubyinterp="no"])
1979 AC_MSG_RESULT($enable_rubyinterp) 1983 AC_MSG_RESULT($enable_rubyinterp)
1980 if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then 1984 if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
1981 if test "$has_eval" = "no"; then 1985 if test "$has_eval" = "no"; then
1982 AC_MSG_ERROR([cannot use Ruby with tiny or small features]) 1986 AC_MSG_ERROR([cannot use Ruby with tiny features])
1983 fi 1987 fi
1984 1988
1985 AC_MSG_CHECKING(--with-ruby-command argument) 1989 AC_MSG_CHECKING(--with-ruby-command argument)
1986 AC_SUBST(vi_cv_path_ruby) 1990 AC_SUBST(vi_cv_path_ruby)
1987 AC_ARG_WITH(ruby-command, [ --with-ruby-command=RUBY name of the Ruby command (default: ruby)], 1991 AC_ARG_WITH(ruby-command, [ --with-ruby-command=RUBY name of the Ruby command (default: ruby)],
2090 AC_ARG_ENABLE(netbeans, 2094 AC_ARG_ENABLE(netbeans,
2091 [ --disable-netbeans Disable NetBeans integration support.], 2095 [ --disable-netbeans Disable NetBeans integration support.],
2092 , [enable_netbeans="yes"]) 2096 , [enable_netbeans="yes"])
2093 if test "$enable_netbeans" = "yes"; then 2097 if test "$enable_netbeans" = "yes"; then
2094 if test "$has_eval" = "no"; then 2098 if test "$has_eval" = "no"; then
2095 AC_MSG_RESULT([cannot use NetBeans with tiny or small features]) 2099 AC_MSG_RESULT([cannot use NetBeans with tiny features])
2096 enable_netbeans="no" 2100 enable_netbeans="no"
2097 else 2101 else
2098 AC_MSG_RESULT(no) 2102 AC_MSG_RESULT(no)
2099 fi 2103 fi
2100 else 2104 else
2105 AC_ARG_ENABLE(channel, 2109 AC_ARG_ENABLE(channel,
2106 [ --disable-channel Disable process communication support.], 2110 [ --disable-channel Disable process communication support.],
2107 , [enable_channel="yes"]) 2111 , [enable_channel="yes"])
2108 if test "$enable_channel" = "yes"; then 2112 if test "$enable_channel" = "yes"; then
2109 if test "$has_eval" = "no"; then 2113 if test "$has_eval" = "no"; then
2110 AC_MSG_RESULT([cannot use channels with tiny or small features]) 2114 AC_MSG_RESULT([cannot use channels with tiny features])
2111 enable_channel="no" 2115 enable_channel="no"
2112 else 2116 else
2113 AC_MSG_RESULT(no) 2117 AC_MSG_RESULT(no)
2114 fi 2118 fi
2115 else 2119 else
2213 AC_ARG_ENABLE(terminal, 2217 AC_ARG_ENABLE(terminal,
2214 [ --enable-terminal Enable terminal emulation support.], 2218 [ --enable-terminal Enable terminal emulation support.],
2215 , [enable_terminal="auto"]) 2219 , [enable_terminal="auto"])
2216 if test "$enable_terminal" = "yes" || test "$enable_terminal" = "auto" -a "x$features" = "xhuge" ; then 2220 if test "$enable_terminal" = "yes" || test "$enable_terminal" = "auto" -a "x$features" = "xhuge" ; then
2217 if test "$has_eval" = "no"; then 2221 if test "$has_eval" = "no"; then
2218 AC_MSG_RESULT([cannot use terminal emulator with tiny or small features]) 2222 AC_MSG_RESULT([cannot use terminal emulator with tiny features])
2219 enable_terminal="no" 2223 enable_terminal="no"
2220 else 2224 else
2221 if test "$enable_terminal" = "auto"; then 2225 if test "$enable_terminal" = "auto"; then
2222 enable_terminal="yes" 2226 enable_terminal="yes"
2223 AC_MSG_RESULT(defaulting to yes) 2227 AC_MSG_RESULT(defaulting to yes)
3720 AC_MSG_RESULT(Defaulting to no) 3724 AC_MSG_RESULT(Defaulting to no)
3721 enable_canberra="no" 3725 enable_canberra="no"
3722 fi 3726 fi
3723 else 3727 else
3724 if test "$enable_canberra" = "yes" -a "$has_eval" = "no"; then 3728 if test "$enable_canberra" = "yes" -a "$has_eval" = "no"; then
3725 AC_MSG_RESULT([cannot use sound with tiny or small features]) 3729 AC_MSG_RESULT([cannot use sound with tiny features])
3726 enable_canberra="no" 3730 enable_canberra="no"
3727 else 3731 else
3728 AC_MSG_RESULT($enable_canberra) 3732 AC_MSG_RESULT($enable_canberra)
3729 fi 3733 fi
3730 fi 3734 fi
4430 AC_MSG_RESULT([gettext() doesn't work]); 4434 AC_MSG_RESULT([gettext() doesn't work]);
4431 LIBS=$olibs)) 4435 LIBS=$olibs))
4432 else 4436 else
4433 AC_MSG_RESULT([msgfmt not found - disabled]); 4437 AC_MSG_RESULT([msgfmt not found - disabled]);
4434 fi 4438 fi
4435 if test $have_gettext = "yes" -a "x$features" != "xtiny" -a "x$features" != "xsmall"; then 4439 if test $have_gettext = "yes" -a "x$features" != "xtiny"; then
4436 AC_DEFINE(HAVE_GETTEXT) 4440 AC_DEFINE(HAVE_GETTEXT)
4437 MAKEMO=yes 4441 MAKEMO=yes
4438 AC_SUBST(MAKEMO) 4442 AC_SUBST(MAKEMO)
4439 dnl this was added in GNU gettext 0.10.36 4443 dnl this was added in GNU gettext 0.10.36
4440 AC_CHECK_FUNCS(bind_textdomain_codeset) 4444 AC_CHECK_FUNCS(bind_textdomain_codeset)