To: vim_dev@googlegroups.com Subject: Patch 7.4.966 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.966 Problem: Configure doesn't work with a space in a path. Solution: Put paths in quotes. (James McCoy, close #525) Files: src/configure.in, src/auto/configure *** ../vim-7.4.965/src/configure.in 2015-11-19 13:46:43.654535474 +0100 --- src/configure.in 2015-12-11 18:08:22.126201591 +0100 *************** *** 546,564 **** fi if test "x$vi_cv_with_luajit" != "xno" && test "X$vi_cv_version_luajit" != "X"; then AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit) ! if test -f $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit/lua.h; then AC_MSG_RESULT(yes) LUA_INC=/luajit-$vi_cv_version_luajit fi fi if test "X$LUA_INC" = "X"; then AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include) ! if test -f $vi_cv_path_lua_pfx/include/lua.h; then AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua) ! if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then AC_MSG_RESULT(yes) LUA_INC=/lua$vi_cv_version_lua else --- 546,564 ---- fi if test "x$vi_cv_with_luajit" != "xno" && test "X$vi_cv_version_luajit" != "X"; then AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit) ! if test -f "$vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit/lua.h"; then AC_MSG_RESULT(yes) LUA_INC=/luajit-$vi_cv_version_luajit fi fi if test "X$LUA_INC" = "X"; then AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include) ! if test -f "$vi_cv_path_lua_pfx/include/lua.h"; then AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua) ! if test -f "$vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h"; then AC_MSG_RESULT(yes) LUA_INC=/lua$vi_cv_version_lua else *************** *** 734,752 **** SCHEME_INC= if test "X$vi_cv_path_mzscheme_pfx" != "X"; then AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include) ! if test -f $vi_cv_path_mzscheme_pfx/include/scheme.h; then SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt) ! if test -f $vi_cv_path_mzscheme_pfx/include/plt/scheme.h; then AC_MSG_RESULT(yes) SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt else AC_MSG_RESULT(no) AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket) ! if test -f $vi_cv_path_mzscheme_pfx/include/racket/scheme.h; then AC_MSG_RESULT(yes) SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/racket else --- 734,752 ---- SCHEME_INC= if test "X$vi_cv_path_mzscheme_pfx" != "X"; then AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include) ! if test -f "$vi_cv_path_mzscheme_pfx/include/scheme.h"; then SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include AC_MSG_RESULT(yes) else AC_MSG_RESULT(no) AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt) ! if test -f "$vi_cv_path_mzscheme_pfx/include/plt/scheme.h"; then AC_MSG_RESULT(yes) SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt else AC_MSG_RESULT(no) AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket) ! if test -f "$vi_cv_path_mzscheme_pfx/include/racket/scheme.h"; then AC_MSG_RESULT(yes) SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/racket else *************** *** 809,824 **** fi AC_MSG_CHECKING(for racket collects directory) ! if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/plt/ else ! if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/racket/ else ! if test -d $vi_cv_path_mzscheme_pfx/share/racket/collects; then SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/share/racket/ else ! if test -d $vi_cv_path_mzscheme_pfx/collects; then SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/ fi fi --- 809,824 ---- fi AC_MSG_CHECKING(for racket collects directory) ! if test -d "$vi_cv_path_mzscheme_pfx/lib/plt/collects"; then SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/plt/ else ! if test -d "$vi_cv_path_mzscheme_pfx/lib/racket/collects"; then SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/racket/ else ! if test -d "$vi_cv_path_mzscheme_pfx/share/racket/collects"; then SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/share/racket/ else ! if test -d "$vi_cv_path_mzscheme_pfx/collects"; then SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/ fi fi *************** *** 1656,1662 **** fi if test "X$vi_cv_path_tcl" != "X"; then AC_MSG_CHECKING(Tcl version) ! if echo 'exit [[expr [info tclversion] < 8.0]]' | $vi_cv_path_tcl - ; then tclver=`echo 'puts [[info tclversion]]' | $vi_cv_path_tcl -` AC_MSG_RESULT($tclver - OK); 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 -` --- 1656,1662 ---- fi if test "X$vi_cv_path_tcl" != "X"; then AC_MSG_CHECKING(Tcl version) ! if echo 'exit [[expr [info tclversion] < 8.0]]' | "$vi_cv_path_tcl" - ; then tclver=`echo 'puts [[info tclversion]]' | $vi_cv_path_tcl -` AC_MSG_RESULT($tclver - OK); 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 -` *************** *** 1690,1698 **** tclcnf="/System/Library/Frameworks/Tcl.framework" fi for try in $tclcnf; do ! if test -f $try/tclConfig.sh; then AC_MSG_RESULT($try/tclConfig.sh) ! . $try/tclConfig.sh dnl use eval, because tcl 8.2 includes ${TCL_DBGX} TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"` dnl Use $TCL_DEFS for -D_THREAD_SAFE et al. But only use the --- 1690,1698 ---- tclcnf="/System/Library/Frameworks/Tcl.framework" fi for try in $tclcnf; do ! if test -f "$try/tclConfig.sh"; then AC_MSG_RESULT($try/tclConfig.sh) ! . "$try/tclConfig.sh" dnl use eval, because tcl 8.2 includes ${TCL_DBGX} TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"` dnl Use $TCL_DEFS for -D_THREAD_SAFE et al. But only use the *************** *** 1710,1718 **** for ver in "" $tclver ; do for try in $tcllib ; do trylib=tcl$ver$ext ! if test -f $try/lib$trylib ; then AC_MSG_RESULT($try/lib$trylib) ! TCL_LIBS="-L$try -ltcl$ver -ldl -lm" if test "`(uname) 2>/dev/null`" = SunOS && uname -r | grep '^5' >/dev/null; then TCL_LIBS="$TCL_LIBS -R $try" --- 1710,1718 ---- for ver in "" $tclver ; do for try in $tcllib ; do trylib=tcl$ver$ext ! if test -f "$try/lib$trylib" ; then AC_MSG_RESULT($try/lib$trylib) ! TCL_LIBS="-L\"$try\" -ltcl$ver -ldl -lm" if test "`(uname) 2>/dev/null`" = SunOS && uname -r | grep '^5' >/dev/null; then TCL_LIBS="$TCL_LIBS -R $try" *** ../vim-7.4.965/src/auto/configure 2015-11-19 13:46:43.658535430 +0100 --- src/auto/configure 2015-12-11 18:09:32.397443541 +0100 *************** *** 5017,5023 **** if test "x$vi_cv_with_luajit" != "xno" && test "X$vi_cv_version_luajit" != "X"; then { $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 $as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit... " >&6; } ! if test -f $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit/lua.h; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } LUA_INC=/luajit-$vi_cv_version_luajit --- 5017,5023 ---- if test "x$vi_cv_with_luajit" != "xno" && test "X$vi_cv_version_luajit" != "X"; then { $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 $as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit... " >&6; } ! if test -f "$vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit/lua.h"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } LUA_INC=/luajit-$vi_cv_version_luajit *************** *** 5026,5032 **** if test "X$LUA_INC" = "X"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include" >&5 $as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include... " >&6; } ! if test -f $vi_cv_path_lua_pfx/include/lua.h; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else --- 5026,5032 ---- if test "X$LUA_INC" = "X"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include" >&5 $as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include... " >&6; } ! if test -f "$vi_cv_path_lua_pfx/include/lua.h"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else *************** *** 5034,5040 **** $as_echo "no" >&6; } { $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 $as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua... " >&6; } ! if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } LUA_INC=/lua$vi_cv_version_lua --- 5034,5040 ---- $as_echo "no" >&6; } { $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 $as_echo_n "checking if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua... " >&6; } ! if test -f "$vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } LUA_INC=/lua$vi_cv_version_lua *************** *** 5285,5291 **** if test "X$vi_cv_path_mzscheme_pfx" != "X"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include" >&5 $as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include... " >&6; } ! if test -f $vi_cv_path_mzscheme_pfx/include/scheme.h; then SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } --- 5285,5291 ---- if test "X$vi_cv_path_mzscheme_pfx" != "X"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include" >&5 $as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include... " >&6; } ! if test -f "$vi_cv_path_mzscheme_pfx/include/scheme.h"; then SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } *************** *** 5294,5300 **** $as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt" >&5 $as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt... " >&6; } ! if test -f $vi_cv_path_mzscheme_pfx/include/plt/scheme.h; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt --- 5294,5300 ---- $as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt" >&5 $as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt... " >&6; } ! if test -f "$vi_cv_path_mzscheme_pfx/include/plt/scheme.h"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt *************** *** 5303,5309 **** $as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket" >&5 $as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket... " >&6; } ! if test -f $vi_cv_path_mzscheme_pfx/include/racket/scheme.h; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/racket --- 5303,5309 ---- $as_echo "no" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket" >&5 $as_echo_n "checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket... " >&6; } ! if test -f "$vi_cv_path_mzscheme_pfx/include/racket/scheme.h"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/racket *************** *** 5372,5387 **** { $as_echo "$as_me:${as_lineno-$LINENO}: checking for racket collects directory" >&5 $as_echo_n "checking for racket collects directory... " >&6; } ! if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/plt/ else ! if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/racket/ else ! if test -d $vi_cv_path_mzscheme_pfx/share/racket/collects; then SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/share/racket/ else ! if test -d $vi_cv_path_mzscheme_pfx/collects; then SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/ fi fi --- 5372,5387 ---- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for racket collects directory" >&5 $as_echo_n "checking for racket collects directory... " >&6; } ! if test -d "$vi_cv_path_mzscheme_pfx/lib/plt/collects"; then SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/plt/ else ! if test -d "$vi_cv_path_mzscheme_pfx/lib/racket/collects"; then SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/racket/ else ! if test -d "$vi_cv_path_mzscheme_pfx/share/racket/collects"; then SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/share/racket/ else ! if test -d "$vi_cv_path_mzscheme_pfx/collects"; then SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/ fi fi *************** *** 6843,6849 **** if test "X$vi_cv_path_tcl" != "X"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking Tcl version" >&5 $as_echo_n "checking Tcl version... " >&6; } ! if echo 'exit [expr [info tclversion] < 8.0]' | $vi_cv_path_tcl - ; then tclver=`echo 'puts [info tclversion]' | $vi_cv_path_tcl -` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tclver - OK" >&5 $as_echo "$tclver - OK" >&6; }; --- 6843,6849 ---- if test "X$vi_cv_path_tcl" != "X"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking Tcl version" >&5 $as_echo_n "checking Tcl version... " >&6; } ! if echo 'exit [expr [info tclversion] < 8.0]' | "$vi_cv_path_tcl" - ; then tclver=`echo 'puts [info tclversion]' | $vi_cv_path_tcl -` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tclver - OK" >&5 $as_echo "$tclver - OK" >&6; }; *************** *** 6880,6889 **** tclcnf="/System/Library/Frameworks/Tcl.framework" fi for try in $tclcnf; do ! if test -f $try/tclConfig.sh; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 $as_echo "$try/tclConfig.sh" >&6; } ! . $try/tclConfig.sh TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"` 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'` break --- 6880,6889 ---- tclcnf="/System/Library/Frameworks/Tcl.framework" fi for try in $tclcnf; do ! if test -f "$try/tclConfig.sh"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 $as_echo "$try/tclConfig.sh" >&6; } ! . "$try/tclConfig.sh" TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"` 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'` break *************** *** 6900,6909 **** for ver in "" $tclver ; do for try in $tcllib ; do trylib=tcl$ver$ext ! if test -f $try/lib$trylib ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/lib$trylib" >&5 $as_echo "$try/lib$trylib" >&6; } ! TCL_LIBS="-L$try -ltcl$ver -ldl -lm" if test "`(uname) 2>/dev/null`" = SunOS && uname -r | grep '^5' >/dev/null; then TCL_LIBS="$TCL_LIBS -R $try" --- 6900,6909 ---- for ver in "" $tclver ; do for try in $tcllib ; do trylib=tcl$ver$ext ! if test -f "$try/lib$trylib" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/lib$trylib" >&5 $as_echo "$try/lib$trylib" >&6; } ! TCL_LIBS="-L\"$try\" -ltcl$ver -ldl -lm" if test "`(uname) 2>/dev/null`" = SunOS && uname -r | grep '^5' >/dev/null; then TCL_LIBS="$TCL_LIBS -R $try" *** ../vim-7.4.965/src/version.c 2015-12-11 17:14:23.481067147 +0100 --- src/version.c 2015-12-11 18:09:09.513690421 +0100 *************** *** 743,744 **** --- 743,746 ---- { /* Add new patch number below this line */ + /**/ + 966, /**/ -- hundred-and-one symptoms of being an internet addict: 235. You start naming your kids Pascal, COBOL, Algol and Fortran. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///