Mercurial > vim

comparison src/configure.in @ 6415:3421b24e419c v7.4.538

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
1039 AC_ARG_ENABLE(pythoninterp, 1039 AC_ARG_ENABLE(pythoninterp,
1040 [ --enable-pythoninterp[=OPTS] Include Python interpreter. [default=no] [OPTS=no/yes/dynamic]], , 1040 [ --enable-pythoninterp[=OPTS] Include Python interpreter. [default=no] [OPTS=no/yes/dynamic]], ,
1041 [enable_pythoninterp="no"]) 1041 [enable_pythoninterp="no"])
1042 AC_MSG_RESULT($enable_pythoninterp) 1042 AC_MSG_RESULT($enable_pythoninterp)
1043 if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then 1043 if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
1044 if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
1045 AC_MSG_ERROR([cannot use Python with tiny or small features])
1046 fi
1047
1044 dnl -- find the python executable 1048 dnl -- find the python executable
1045 AC_PATH_PROGS(vi_cv_path_python, python2 python) 1049 AC_PATH_PROGS(vi_cv_path_python, python2 python)
1046 if test "X$vi_cv_path_python" != "X"; then 1050 if test "X$vi_cv_path_python" != "X"; then
1047 1051
1048 dnl -- get its version number 1052 dnl -- get its version number
1241 AC_ARG_ENABLE(python3interp, 1245 AC_ARG_ENABLE(python3interp,
1242 [ --enable-python3interp[=OPTS] Include Python3 interpreter. [default=no] [OPTS=no/yes/dynamic]], , 1246 [ --enable-python3interp[=OPTS] Include Python3 interpreter. [default=no] [OPTS=no/yes/dynamic]], ,
1243 [enable_python3interp="no"]) 1247 [enable_python3interp="no"])
1244 AC_MSG_RESULT($enable_python3interp) 1248 AC_MSG_RESULT($enable_python3interp)
1245 if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then 1249 if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
1250 if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
1251 AC_MSG_ERROR([cannot use Python with tiny or small features])
1252 fi
1253
1246 dnl -- find the python3 executable 1254 dnl -- find the python3 executable
1247 AC_PATH_PROGS(vi_cv_path_python3, python3 python) 1255 AC_PATH_PROGS(vi_cv_path_python3, python3 python)
1248 if test "X$vi_cv_path_python3" != "X"; then 1256 if test "X$vi_cv_path_python3" != "X"; then
1249 1257
1250 dnl -- get its version number 1258 dnl -- get its version number
1718 AC_ARG_ENABLE(rubyinterp, 1726 AC_ARG_ENABLE(rubyinterp,
1719 [ --enable-rubyinterp[=OPTS] Include Ruby interpreter. [default=no] [OPTS=no/yes/dynamic]], , 1727 [ --enable-rubyinterp[=OPTS] Include Ruby interpreter. [default=no] [OPTS=no/yes/dynamic]], ,
1720 [enable_rubyinterp="no"]) 1728 [enable_rubyinterp="no"])
1721 AC_MSG_RESULT($enable_rubyinterp) 1729 AC_MSG_RESULT($enable_rubyinterp)
1722 if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then 1730 if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then
1731 if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
1732 AC_MSG_ERROR([cannot use Ruby with tiny or small features])
1733 fi
1734
1723 AC_MSG_CHECKING(--with-ruby-command argument) 1735 AC_MSG_CHECKING(--with-ruby-command argument)
1724 AC_SUBST(vi_cv_path_ruby) 1736 AC_SUBST(vi_cv_path_ruby)
1725 AC_ARG_WITH(ruby-command, [ --with-ruby-command=RUBY name of the Ruby command (default: ruby)], 1737 AC_ARG_WITH(ruby-command, [ --with-ruby-command=RUBY name of the Ruby command (default: ruby)],
1726 RUBY_CMD="$withval"; vi_cv_path_ruby="$withval"; AC_MSG_RESULT($RUBY_CMD), 1738 RUBY_CMD="$withval"; vi_cv_path_ruby="$withval"; AC_MSG_RESULT($RUBY_CMD),
1727 RUBY_CMD="ruby"; AC_MSG_RESULT(defaulting to $RUBY_CMD)) 1739 RUBY_CMD="ruby"; AC_MSG_RESULT(defaulting to $RUBY_CMD))