Mercurial > vim
diff src/auto/configure @ 6415:3421b24e419c v7.4.538
updated for version 7.4.538
Problem: Tests fail with small features plus Python.
Solution: Disallow weird combination of options. Do not set "fdm" when
folding is disabled.
author | Bram Moolenaar <bram@vim.org> |
---|---|
date | Sun, 30 Nov 2014 13:34:23 +0100 |
parents | 0446fa17bd95 |
children | 7026d6f3367f |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -5728,6 +5728,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_pythoninterp" >&5 $as_echo "$enable_pythoninterp" >&6; } if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then + if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then + as_fn_error $? "cannot use Python with tiny or small features" "$LINENO" 5 + fi + for ac_prog in python2 python do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -6044,6 +6048,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_python3interp" >&5 $as_echo "$enable_python3interp" >&6; } if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then + if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then + as_fn_error $? "cannot use Python with tiny or small features" "$LINENO" 5 + fi + for ac_prog in python3 python do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -6929,6 +6937,10 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_rubyinterp" >&5 $as_echo "$enable_rubyinterp" >&6; } if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then + if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then + as_fn_error $? "cannot use Ruby with tiny or small features" "$LINENO" 5 + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-ruby-command argument" >&5 $as_echo_n "checking --with-ruby-command argument... " >&6; }