comparison src/auto/configure @ 7322:6f398bb76c29 v7.4.966

commit https://github.com/vim/vim/commit/49222bee65228c7b5994b33c1568394c3cbf4583 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Dec 11 18:11:30 2015 +0100 patch 7.4.966 Problem: Configure doesn't work with a space in a path. Solution: Put paths in quotes. (James McCoy, close https://github.com/vim/vim/issues/525)
author Christian Brabandt <cb@256bit.org>
date Fri, 11 Dec 2015 18:15:04 +0100
parents a4d10eec6356
children b871e4bdb319
comparison
equal deleted inserted replaced
7321:3eb18453ecc6 7322:6f398bb76c29
5015 vi_cv_version_lua="$vi_cv_version_plain_lua" 5015 vi_cv_version_lua="$vi_cv_version_plain_lua"
5016 fi 5016 fi
5017 if test "x$vi_cv_with_luajit" != "xno" && test "X$vi_cv_version_luajit" != "X"; then 5017 if test "x$vi_cv_with_luajit" != "xno" && test "X$vi_cv_version_luajit" != "X"; then
5018 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit" >&5 5018 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit" >&5
5019 $as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit... " >&6; } 5019 $as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit... " >&6; }
5020 if test -f $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit/lua.h; then 5020 if test -f "$vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit/lua.h"; then
5021 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 5021 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5022 $as_echo "yes" >&6; } 5022 $as_echo "yes" >&6; }
5023 LUA_INC=/luajit-$vi_cv_version_luajit 5023 LUA_INC=/luajit-$vi_cv_version_luajit
5024 fi 5024 fi
5025 fi 5025 fi
5026 if test "X$LUA_INC" = "X"; then 5026 if test "X$LUA_INC" = "X"; then
5027 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include" >&5 5027 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include" >&5
5028 $as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include... " >&6; } 5028 $as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include... " >&6; }
5029 if test -f $vi_cv_path_lua_pfx/include/lua.h; then 5029 if test -f "$vi_cv_path_lua_pfx/include/lua.h"; then
5030 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 5030 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5031 $as_echo "yes" >&6; } 5031 $as_echo "yes" >&6; }
5032 else 5032 else
5033 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 5033 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5034 $as_echo "no" >&6; } 5034 $as_echo "no" >&6; }
5035 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua" >&5 5035 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua" >&5
5036 $as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua... " >&6; } 5036 $as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua... " >&6; }
5037 if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then 5037 if test -f "$vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h"; then
5038 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 5038 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5039 $as_echo "yes" >&6; } 5039 $as_echo "yes" >&6; }
5040 LUA_INC=/lua$vi_cv_version_lua 5040 LUA_INC=/lua$vi_cv_version_lua
5041 else 5041 else
5042 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 5042 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5283 5283
5284 SCHEME_INC= 5284 SCHEME_INC=
5285 if test "X$vi_cv_path_mzscheme_pfx" != "X"; then 5285 if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
5286 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include" >&5 5286 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include" >&5
5287 $as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include... " >&6; } 5287 $as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include... " >&6; }
5288 if test -f $vi_cv_path_mzscheme_pfx/include/scheme.h; then 5288 if test -f "$vi_cv_path_mzscheme_pfx/include/scheme.h"; then
5289 SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include 5289 SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include
5290 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 5290 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5291 $as_echo "yes" >&6; } 5291 $as_echo "yes" >&6; }
5292 else 5292 else
5293 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 5293 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5294 $as_echo "no" >&6; } 5294 $as_echo "no" >&6; }
5295 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt" >&5 5295 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt" >&5
5296 $as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt... " >&6; } 5296 $as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt... " >&6; }
5297 if test -f $vi_cv_path_mzscheme_pfx/include/plt/scheme.h; then 5297 if test -f "$vi_cv_path_mzscheme_pfx/include/plt/scheme.h"; then
5298 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 5298 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5299 $as_echo "yes" >&6; } 5299 $as_echo "yes" >&6; }
5300 SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt 5300 SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt
5301 else 5301 else
5302 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 5302 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5303 $as_echo "no" >&6; } 5303 $as_echo "no" >&6; }
5304 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket" >&5 5304 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket" >&5
5305 $as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket... " >&6; } 5305 $as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket... " >&6; }
5306 if test -f $vi_cv_path_mzscheme_pfx/include/racket/scheme.h; then 5306 if test -f "$vi_cv_path_mzscheme_pfx/include/racket/scheme.h"; then
5307 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 5307 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
5308 $as_echo "yes" >&6; } 5308 $as_echo "yes" >&6; }
5309 SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/racket 5309 SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/racket
5310 else 5310 else
5311 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 5311 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
5370 fi 5370 fi
5371 fi 5371 fi
5372 5372
5373 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for racket collects directory" >&5 5373 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for racket collects directory" >&5
5374 $as_echo_n "checking for racket collects directory... " >&6; } 5374 $as_echo_n "checking for racket collects directory... " >&6; }
5375 if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then 5375 if test -d "$vi_cv_path_mzscheme_pfx/lib/plt/collects"; then
5376 SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/plt/ 5376 SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/plt/
5377 else 5377 else
5378 if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then 5378 if test -d "$vi_cv_path_mzscheme_pfx/lib/racket/collects"; then
5379 SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/racket/ 5379 SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/racket/
5380 else 5380 else
5381 if test -d $vi_cv_path_mzscheme_pfx/share/racket/collects; then 5381 if test -d "$vi_cv_path_mzscheme_pfx/share/racket/collects"; then
5382 SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/share/racket/ 5382 SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/share/racket/
5383 else 5383 else
5384 if test -d $vi_cv_path_mzscheme_pfx/collects; then 5384 if test -d "$vi_cv_path_mzscheme_pfx/collects"; then
5385 SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/ 5385 SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/
5386 fi 5386 fi
5387 fi 5387 fi
5388 fi 5388 fi
5389 fi 5389 fi
6841 6841
6842 fi 6842 fi
6843 if test "X$vi_cv_path_tcl" != "X"; then 6843 if test "X$vi_cv_path_tcl" != "X"; then
6844 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Tcl version" >&5 6844 { $as_echo "$as_me:${as_lineno-$LINENO}: checking Tcl version" >&5
6845 $as_echo_n "checking Tcl version... " >&6; } 6845 $as_echo_n "checking Tcl version... " >&6; }
6846 if echo 'exit [expr [info tclversion] < 8.0]' | $vi_cv_path_tcl - ; then 6846 if echo 'exit [expr [info tclversion] < 8.0]' | "$vi_cv_path_tcl" - ; then
6847 tclver=`echo 'puts [info tclversion]' | $vi_cv_path_tcl -` 6847 tclver=`echo 'puts [info tclversion]' | $vi_cv_path_tcl -`
6848 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tclver - OK" >&5 6848 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tclver - OK" >&5
6849 $as_echo "$tclver - OK" >&6; }; 6849 $as_echo "$tclver - OK" >&6; };
6850 tclloc=`echo 'set l [info library];set i [string last lib $l];incr i -2;puts [string range $l 0 $i]' | $vi_cv_path_tcl -` 6850 tclloc=`echo 'set l [info library];set i [string last lib $l];incr i -2;puts [string range $l 0 $i]' | $vi_cv_path_tcl -`
6851 6851
6878 tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`" 6878 tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
6879 else 6879 else
6880 tclcnf="/System/Library/Frameworks/Tcl.framework" 6880 tclcnf="/System/Library/Frameworks/Tcl.framework"
6881 fi 6881 fi
6882 for try in $tclcnf; do 6882 for try in $tclcnf; do
6883 if test -f $try/tclConfig.sh; then 6883 if test -f "$try/tclConfig.sh"; then
6884 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 6884 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5
6885 $as_echo "$try/tclConfig.sh" >&6; } 6885 $as_echo "$try/tclConfig.sh" >&6; }
6886 . $try/tclConfig.sh 6886 . "$try/tclConfig.sh"
6887 TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"` 6887 TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
6888 TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^[^-]/d' -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'` 6888 TCL_DEFS=`echo $TCL_DEFS | sed -e 's/\\\\ /\\\\X/g' | tr ' ' '\012' | sed -e '/^[^-]/d' -e '/^-[^D]/d' -e '/-D[^_]/d' -e 's/-D_/ -D_/' | tr '\012' ' ' | sed -e 's/\\\\X/\\\\ /g'`
6889 break 6889 break
6890 fi 6890 fi
6891 done 6891 done
6898 tcllib="$tcllib `echo $tclinc | sed s/include/lib64/g`" 6898 tcllib="$tcllib `echo $tclinc | sed s/include/lib64/g`"
6899 for ext in .so .a ; do 6899 for ext in .so .a ; do
6900 for ver in "" $tclver ; do 6900 for ver in "" $tclver ; do
6901 for try in $tcllib ; do 6901 for try in $tcllib ; do
6902 trylib=tcl$ver$ext 6902 trylib=tcl$ver$ext
6903 if test -f $try/lib$trylib ; then 6903 if test -f "$try/lib$trylib" ; then
6904 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/lib$trylib" >&5 6904 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/lib$trylib" >&5
6905 $as_echo "$try/lib$trylib" >&6; } 6905 $as_echo "$try/lib$trylib" >&6; }
6906 TCL_LIBS="-L$try -ltcl$ver -ldl -lm" 6906 TCL_LIBS="-L\"$try\" -ltcl$ver -ldl -lm"
6907 if test "`(uname) 2>/dev/null`" = SunOS && 6907 if test "`(uname) 2>/dev/null`" = SunOS &&
6908 uname -r | grep '^5' >/dev/null; then 6908 uname -r | grep '^5' >/dev/null; then
6909 TCL_LIBS="$TCL_LIBS -R $try" 6909 TCL_LIBS="$TCL_LIBS -R $try"
6910 fi 6910 fi
6911 break 3 6911 break 3