patch 7.4.966

Problem:    Configure doesn't work with a space in a path.
Solution:   Put paths in quotes. (James McCoy, close #525)

diff --git a/src/auto/configure b/src/auto/configure
index 1acf7da2e3bca94aa9a5f5301828f3abda3d91e9..0564b9f3a060ee17bfb7f9a6e55d5be33d8491ae 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5017,7 +5017,7 @@ $as_echo "$vi_cv_version_plain_lua" >&6; }
     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
+      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,7 +5026,7 @@ $as_echo "yes" >&6; }
     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
+      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,7 +5034,7 @@ $as_echo "yes" >&6; }
 $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
+       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,7 +5285,7 @@ $as_echo "$vi_cv_path_mzscheme_pfx" >&6; }
   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
+    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,7 +5294,7 @@ $as_echo "yes" >&6; }
 $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
+      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,7 +5303,7 @@ $as_echo "yes" >&6; }
 $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
+       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,16 +5372,16 @@ $as_echo "no" >&6; }
 
     { $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
+    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
+      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
+       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
+         if test -d "$vi_cv_path_mzscheme_pfx/collects"; then
            SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/
          fi
        fi
@@ -6843,7 +6843,7 @@ fi
   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
+    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,10 +6880,10 @@ $as_echo_n "checking for location of tclConfig.sh script... " >&6; }
                  tclcnf="/System/Library/Frameworks/Tcl.framework"
        fi
        for try in $tclcnf; do
-         if test -f $try/tclConfig.sh; then
+         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
+           . "$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,10 +6900,10 @@ $as_echo_n "checking for Tcl library by myself... " >&6; }
            for ver in "" $tclver ; do
              for try in $tcllib ; do
                trylib=tcl$ver$ext
-               if test -f $try/lib$trylib ; then
+               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"
+                 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"

diff --git a/src/configure.in b/src/configure.in
index 4f4b2fd4389d55b7cccea60cf24aabbafc8f60d4..3934f88c542f70c76707188ad890ad41777e427c 100644 (file)
--- a/src/configure.in
+++ b/src/configure.in
@@ -546,19 +546,19 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
     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
+      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
+      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
+       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,19 +734,19 @@ if test "$enable_mzschemeinterp" = "yes"; then
   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
+    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
+      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
+       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,16 +809,16 @@ if test "$enable_mzschemeinterp" = "yes"; then
     fi
 
     AC_MSG_CHECKING(for racket collects directory)
-    if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
+    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
+      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
+       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
+         if test -d "$vi_cv_path_mzscheme_pfx/collects"; then
            SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/
          fi
        fi
@@ -1656,7 +1656,7 @@ if test "$enable_tclinterp" = "yes"; then
   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
+    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,9 +1690,9 @@ if test "$enable_tclinterp" = "yes"; then
          tclcnf="/System/Library/Frameworks/Tcl.framework"
        fi
        for try in $tclcnf; do
-         if test -f $try/tclConfig.sh; then
+         if test -f "$try/tclConfig.sh"; then
            AC_MSG_RESULT($try/tclConfig.sh)
-           . $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,9 +1710,9 @@ if test "$enable_tclinterp" = "yes"; then
            for ver in "" $tclver ; do
              for try in $tcllib ; do
                trylib=tcl$ver$ext
-               if test -f $try/lib$trylib ; then
+               if test -f "$try/lib$trylib" ; then
                  AC_MSG_RESULT($try/lib$trylib)
-                 TCL_LIBS="-L$try -ltcl$ver -ldl -lm"
+                 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"

diff --git a/src/version.c b/src/version.c
index 049e76600399053c9c0208f2fc88b3ad8e45552f..c67e47cb79a2e1a433c9fbedc29a33f359679070 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    966,
 /**/
     965,
 /**/