Mercurial > vim
diff src/auto/configure @ 30645:101f08b49ed3 v9.0.0657
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 | 2295ee9c025d |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -1523,7 +1523,7 @@ Optional Packages: --with-view-name=NAME what to call the View executable --with-global-runtime=DIR global runtime directory in 'runtimepath', comma-separated for multiple directories --with-modified-by=NAME name of who modified a release version - --with-features=TYPE tiny, small, normal, big or huge (default: huge) + --with-features=TYPE tiny, normal, big or huge (default: huge) --with-compiledby=NAME name to show in :version message --with-lua-prefix=PFX Prefix where Lua is installed. --with-luajit Link with LuaJIT instead of Lua. @@ -5219,13 +5219,15 @@ else fi +case "$features" in + small) features="tiny" ;; +esac + dovimdiff="" dogvimdiff="" case "$features" in tiny) $as_echo "#define FEAT_TINY 1" >>confdefs.h ;; - small) $as_echo "#define FEAT_SMALL 1" >>confdefs.h - ;; normal) $as_echo "#define FEAT_NORMAL 1" >>confdefs.h dovimdiff="installvimdiff"; dogvimdiff="installgvimdiff" ;; @@ -5242,7 +5244,7 @@ esac -if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then +if test "x$features" = "xtiny"; then has_eval=no else has_eval=yes @@ -5300,7 +5302,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking diff feature" >&5 $as_echo_n "checking diff feature... " >&6; } -if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then +if test "x$features" = "xtiny"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled in $features version" >&5 $as_echo "disabled in $features version" >&6; } else @@ -5326,7 +5328,7 @@ fi if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then if test "$has_eval" = "no"; then - as_fn_error $? "cannot use Lua with tiny or small features" "$LINENO" 5 + as_fn_error $? "cannot use Lua with tiny features" "$LINENO" 5 fi @@ -6096,7 +6098,7 @@ fi $as_echo "$enable_perlinterp" >&6; } if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then if test "$has_eval" = "no"; then - as_fn_error $? "cannot use Perl with tiny or small features" "$LINENO" 5 + as_fn_error $? "cannot use Perl with tiny features" "$LINENO" 5 fi # Extract the first word of "perl", so it can be a program name with args. @@ -6301,7 +6303,7 @@ fi $as_echo "$enable_pythoninterp" >&6; } if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then if test "$has_eval" = "no"; then - as_fn_error $? "cannot use Python with tiny or small features" "$LINENO" 5 + as_fn_error $? "cannot use Python with tiny features" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-python-command argument" >&5 @@ -6652,7 +6654,7 @@ fi $as_echo "$enable_python3interp" >&6; } if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then if test "$has_eval" = "no"; then - as_fn_error $? "cannot use Python with tiny or small features" "$LINENO" 5 + as_fn_error $? "cannot use Python with tiny features" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-python3-command argument" >&5 @@ -7580,7 +7582,7 @@ fi $as_echo "$enable_rubyinterp" >&6; } if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then if test "$has_eval" = "no"; then - as_fn_error $? "cannot use Ruby with tiny or small features" "$LINENO" 5 + as_fn_error $? "cannot use Ruby with tiny features" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-ruby-command argument" >&5 @@ -7758,8 +7760,8 @@ fi if test "$enable_netbeans" = "yes"; then if test "$has_eval" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use NetBeans with tiny or small features" >&5 -$as_echo "cannot use NetBeans with tiny or small features" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use NetBeans with tiny features" >&5 +$as_echo "cannot use NetBeans with tiny features" >&6; } enable_netbeans="no" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -7781,8 +7783,8 @@ fi if test "$enable_channel" = "yes"; then if test "$has_eval" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use channels with tiny or small features" >&5 -$as_echo "cannot use channels with tiny or small features" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use channels with tiny features" >&5 +$as_echo "cannot use channels with tiny features" >&6; } enable_channel="no" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -8085,8 +8087,8 @@ fi if test "$enable_terminal" = "yes" || test "$enable_terminal" = "auto" -a "x$features" = "xhuge" ; then if test "$has_eval" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use terminal emulator with tiny or small features" >&5 -$as_echo "cannot use terminal emulator with tiny or small features" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use terminal emulator with tiny features" >&5 +$as_echo "cannot use terminal emulator with tiny features" >&6; } enable_terminal="no" else if test "$enable_terminal" = "auto"; then @@ -12892,8 +12894,8 @@ if test "$enable_canberra" = "maybe"; th fi else if test "$enable_canberra" = "yes" -a "$has_eval" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use sound with tiny or small features" >&5 -$as_echo "cannot use sound with tiny or small features" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use sound with tiny features" >&5 +$as_echo "cannot use sound with tiny features" >&6; } enable_canberra="no" else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_canberra" >&5 @@ -14721,7 +14723,7 @@ rm -f core conftest.err conftest.$ac_obj { $as_echo "$as_me:${as_lineno-$LINENO}: result: msgfmt not found - disabled" >&5 $as_echo "msgfmt not found - disabled" >&6; }; fi - if test $have_gettext = "yes" -a "x$features" != "xtiny" -a "x$features" != "xsmall"; then + if test $have_gettext = "yes" -a "x$features" != "xtiny"; then $as_echo "#define HAVE_GETTEXT 1" >>confdefs.h MAKEMO=yes