Skip to content

Commit 49222be

Browse files
brammoolbrammool
committed
patch 7.4.966
Problem: Configure doesn't work with a space in a path. Solution: Put paths in quotes. (James McCoy, close #525)
1 parent 941aea2 commit 49222be

File tree

3 files changed

+32
-30
lines changed

3 files changed

+32
-30
lines changed

‎src/auto/configure‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5017,7 +5017,7 @@ $as_echo "$vi_cv_version_plain_lua" >&6; }
50175017
if test "x$vi_cv_with_luajit" != "xno" && test "X$vi_cv_version_luajit" != "X"; then
50185018
{ $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
50195019
$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
50215021
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
50225022
$as_echo "yes" >&6; }
50235023
LUA_INC=/luajit-$vi_cv_version_luajit
@@ -5026,15 +5026,15 @@ $as_echo "yes" >&6; }
50265026
if test "X$LUA_INC" = "X"; then
50275027
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if lua.h can be found in $vi_cv_path_lua_pfx/include" >&5
50285028
$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
50305030
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
50315031
$as_echo "yes" >&6; }
50325032
else
50335033
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
50345034
$as_echo "no" >&6; }
50355035
{ $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
50365036
$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
50385038
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
50395039
$as_echo "yes" >&6; }
50405040
LUA_INC=/lua$vi_cv_version_lua
@@ -5285,7 +5285,7 @@ $as_echo "$vi_cv_path_mzscheme_pfx" >&6; }
52855285
if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
52865286
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include" >&5
52875287
$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
52895289
SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include
52905290
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
52915291
$as_echo "yes" >&6; }
@@ -5294,7 +5294,7 @@ $as_echo "yes" >&6; }
52945294
$as_echo "no" >&6; }
52955295
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt" >&5
52965296
$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
52985298
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
52995299
$as_echo "yes" >&6; }
53005300
SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt
@@ -5303,7 +5303,7 @@ $as_echo "yes" >&6; }
53035303
$as_echo "no" >&6; }
53045304
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket" >&5
53055305
$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
53075307
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
53085308
$as_echo "yes" >&6; }
53095309
SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/racket
@@ -5372,16 +5372,16 @@ $as_echo "no" >&6; }
53725372

53735373
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for racket collects directory" >&5
53745374
$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
53765376
SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/plt/
53775377
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
53795379
SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/racket/
53805380
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
53825382
SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/share/racket/
53835383
else
5384-
if test -d $vi_cv_path_mzscheme_pfx/collects; then
5384+
if test -d "$vi_cv_path_mzscheme_pfx/collects"; then
53855385
SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/
53865386
fi
53875387
fi
@@ -6843,7 +6843,7 @@ fi
68436843
if test "X$vi_cv_path_tcl" != "X"; then
68446844
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Tcl version" >&5
68456845
$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
68476847
tclver=`echo 'puts [info tclversion]' | $vi_cv_path_tcl -`
68486848
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tclver - OK" >&5
68496849
$as_echo "$tclver - OK" >&6; };
@@ -6880,10 +6880,10 @@ $as_echo_n "checking for location of tclConfig.sh script... " >&6; }
68806880
tclcnf="/System/Library/Frameworks/Tcl.framework"
68816881
fi
68826882
for try in $tclcnf; do
6883-
if test -f $try/tclConfig.sh; then
6883+
if test -f "$try/tclConfig.sh"; then
68846884
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5
68856885
$as_echo "$try/tclConfig.sh" >&6; }
6886-
. $try/tclConfig.sh
6886+
. "$try/tclConfig.sh"
68876887
TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
68886888
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'`
68896889
break
@@ -6900,10 +6900,10 @@ $as_echo_n "checking for Tcl library by myself... " >&6; }
69006900
for ver in "" $tclver ; do
69016901
for try in $tcllib ; do
69026902
trylib=tcl$ver$ext
6903-
if test -f $try/lib$trylib ; then
6903+
if test -f "$try/lib$trylib" ; then
69046904
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/lib$trylib" >&5
69056905
$as_echo "$try/lib$trylib" >&6; }
6906-
TCL_LIBS="-L$try -ltcl$ver -ldl -lm"
6906+
TCL_LIBS="-L\"$try\" -ltcl$ver -ldl -lm"
69076907
if test "`(uname) 2>/dev/null`" = SunOS &&
69086908
uname -r | grep '^5' >/dev/null; then
69096909
TCL_LIBS="$TCL_LIBS -R $try"

‎src/configure.in‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -546,19 +546,19 @@ if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then
546546
fi
547547
if test "x$vi_cv_with_luajit" != "xno" && test "X$vi_cv_version_luajit" != "X"; then
548548
AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit)
549-
if test -f $vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit/lua.h; then
549+
if test -f "$vi_cv_path_lua_pfx/include/luajit-$vi_cv_version_luajit/lua.h"; then
550550
AC_MSG_RESULT(yes)
551551
LUA_INC=/luajit-$vi_cv_version_luajit
552552
fi
553553
fi
554554
if test "X$LUA_INC" = "X"; then
555555
AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include)
556-
if test -f $vi_cv_path_lua_pfx/include/lua.h; then
556+
if test -f "$vi_cv_path_lua_pfx/include/lua.h"; then
557557
AC_MSG_RESULT(yes)
558558
else
559559
AC_MSG_RESULT(no)
560560
AC_MSG_CHECKING(if lua.h can be found in $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua)
561-
if test -f $vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h; then
561+
if test -f "$vi_cv_path_lua_pfx/include/lua$vi_cv_version_lua/lua.h"; then
562562
AC_MSG_RESULT(yes)
563563
LUA_INC=/lua$vi_cv_version_lua
564564
else
@@ -734,19 +734,19 @@ if test "$enable_mzschemeinterp" = "yes"; then
734734
SCHEME_INC=
735735
if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
736736
AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include)
737-
if test -f $vi_cv_path_mzscheme_pfx/include/scheme.h; then
737+
if test -f "$vi_cv_path_mzscheme_pfx/include/scheme.h"; then
738738
SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include
739739
AC_MSG_RESULT(yes)
740740
else
741741
AC_MSG_RESULT(no)
742742
AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/plt)
743-
if test -f $vi_cv_path_mzscheme_pfx/include/plt/scheme.h; then
743+
if test -f "$vi_cv_path_mzscheme_pfx/include/plt/scheme.h"; then
744744
AC_MSG_RESULT(yes)
745745
SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/plt
746746
else
747747
AC_MSG_RESULT(no)
748748
AC_MSG_CHECKING(if scheme.h can be found in $vi_cv_path_mzscheme_pfx/include/racket)
749-
if test -f $vi_cv_path_mzscheme_pfx/include/racket/scheme.h; then
749+
if test -f "$vi_cv_path_mzscheme_pfx/include/racket/scheme.h"; then
750750
AC_MSG_RESULT(yes)
751751
SCHEME_INC=${vi_cv_path_mzscheme_pfx}/include/racket
752752
else
@@ -809,16 +809,16 @@ if test "$enable_mzschemeinterp" = "yes"; then
809809
fi
810810

811811
AC_MSG_CHECKING(for racket collects directory)
812-
if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
812+
if test -d "$vi_cv_path_mzscheme_pfx/lib/plt/collects"; then
813813
SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/plt/
814814
else
815-
if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then
815+
if test -d "$vi_cv_path_mzscheme_pfx/lib/racket/collects"; then
816816
SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/racket/
817817
else
818-
if test -d $vi_cv_path_mzscheme_pfx/share/racket/collects; then
818+
if test -d "$vi_cv_path_mzscheme_pfx/share/racket/collects"; then
819819
SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/share/racket/
820820
else
821-
if test -d $vi_cv_path_mzscheme_pfx/collects; then
821+
if test -d "$vi_cv_path_mzscheme_pfx/collects"; then
822822
SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/
823823
fi
824824
fi
@@ -1656,7 +1656,7 @@ if test "$enable_tclinterp" = "yes"; then
16561656
fi
16571657
if test "X$vi_cv_path_tcl" != "X"; then
16581658
AC_MSG_CHECKING(Tcl version)
1659-
if echo 'exit [[expr [info tclversion] < 8.0]]' | $vi_cv_path_tcl - ; then
1659+
if echo 'exit [[expr [info tclversion] < 8.0]]' | "$vi_cv_path_tcl" - ; then
16601660
tclver=`echo 'puts [[info tclversion]]' | $vi_cv_path_tcl -`
16611661
AC_MSG_RESULT($tclver - OK);
16621662
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
16901690
tclcnf="/System/Library/Frameworks/Tcl.framework"
16911691
fi
16921692
for try in $tclcnf; do
1693-
if test -f $try/tclConfig.sh; then
1693+
if test -f "$try/tclConfig.sh"; then
16941694
AC_MSG_RESULT($try/tclConfig.sh)
1695-
. $try/tclConfig.sh
1695+
. "$try/tclConfig.sh"
16961696
dnl use eval, because tcl 8.2 includes ${TCL_DBGX}
16971697
TCL_LIBS=`eval echo "$TCL_LIB_SPEC $TCL_LIBS"`
16981698
dnl Use $TCL_DEFS for -D_THREAD_SAFE et al. But only use the
@@ -1710,9 +1710,9 @@ if test "$enable_tclinterp" = "yes"; then
17101710
for ver in "" $tclver ; do
17111711
for try in $tcllib ; do
17121712
trylib=tcl$ver$ext
1713-
if test -f $try/lib$trylib ; then
1713+
if test -f "$try/lib$trylib" ; then
17141714
AC_MSG_RESULT($try/lib$trylib)
1715-
TCL_LIBS="-L$try -ltcl$ver -ldl -lm"
1715+
TCL_LIBS="-L\"$try\" -ltcl$ver -ldl -lm"
17161716
if test "`(uname) 2>/dev/null`" = SunOS &&
17171717
uname -r | grep '^5' >/dev/null; then
17181718
TCL_LIBS="$TCL_LIBS -R $try"

‎src/version.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ static char *(features[]) =
741741

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
966,
744746
/**/
745747
965,
746748
/**/

0 commit comments

Comments
 (0)