comparison 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
comparison
equal deleted inserted replaced
6414:af110084ec06 6415:3421b24e419c
5726 fi 5726 fi
5727 5727
5728 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_pythoninterp" >&5 5728 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_pythoninterp" >&5
5729 $as_echo "$enable_pythoninterp" >&6; } 5729 $as_echo "$enable_pythoninterp" >&6; }
5730 if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then 5730 if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
5731 if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
5732 as_fn_error $? "cannot use Python with tiny or small features" "$LINENO" 5
5733 fi
5734
5731 for ac_prog in python2 python 5735 for ac_prog in python2 python
5732 do 5736 do
5733 # Extract the first word of "$ac_prog", so it can be a program name with args. 5737 # Extract the first word of "$ac_prog", so it can be a program name with args.
5734 set dummy $ac_prog; ac_word=$2 5738 set dummy $ac_prog; ac_word=$2
5735 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 5739 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6042 fi 6046 fi
6043 6047
6044 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_python3interp" >&5 6048 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_python3interp" >&5
6045 $as_echo "$enable_python3interp" >&6; } 6049 $as_echo "$enable_python3interp" >&6; }
6046 if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then 6050 if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
6051 if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
6052 as_fn_error $? "cannot use Python with tiny or small features" "$LINENO" 5
6053 fi
6054
6047 for ac_prog in python3 python 6055 for ac_prog in python3 python
6048 do 6056 do
6049 # Extract the first word of "$ac_prog", so it can be a program name with args. 6057 # Extract the first word of "$ac_prog", so it can be a program name with args.
6050 set dummy $ac_prog; ac_word=$2 6058 set dummy $ac_prog; ac_word=$2
6051 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 6059 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
6927 fi 6935 fi
6928 6936
6929 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_rubyinterp" >&5 6937 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_rubyinterp" >&5
6930 $as_echo "$enable_rubyinterp" >&6; } 6938 $as_echo "$enable_rubyinterp" >&6; }
6931 if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then 6939 if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
6940 if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
6941 as_fn_error $? "cannot use Ruby with tiny or small features" "$LINENO" 5
6942 fi
6943
6932 { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-ruby-command argument" >&5 6944 { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-ruby-command argument" >&5
6933 $as_echo_n "checking --with-ruby-command argument... " >&6; } 6945 $as_echo_n "checking --with-ruby-command argument... " >&6; }
6934 6946
6935 6947
6936 # Check whether --with-ruby-command was given. 6948 # Check whether --with-ruby-command was given.