* config/ltmain.m4sh (func_mode_link), tests/objectlist.test:

Make sure the argument to `-objectlist' may contain spaces.

diff --git a/ChangeLog b/ChangeLog
index 3cdc25349301aa0becf70d0866f1a45e633b5a6f..60fc8637936d96984361d02ef6029ae4e43d182d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-22  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+       * config/ltmain.m4sh (func_mode_link), tests/objectlist.test:
+       Make sure the argument to `-objectlist' may contain spaces.
+
 2004-11-19  Gary V. Vaughan  <gary@gnu.org>
 
        * config/m4general.m4sh, config/mailnotify.m4sh,

diff --git a/config/ltmain.m4sh b/config/ltmain.m4sh
index 7f6100602adc289ab91d27defc13cd8dca7e9ece..7d8175f7ce2904f96456130554aa981bea5305c2 100644 (file)
--- a/config/ltmain.m4sh
+++ b/config/ltmain.m4sh
@@ -2292,7 +2292,7 @@ func_mode_link ()
          if test -f "$arg"; then
            save_arg=$arg
            moreargs=
-           for fil in `cat $save_arg`
+           for fil in `cat "$save_arg"`
            do
 #            moreargs="$moreargs $fil"
              arg=$fil

diff --git a/tests/objectlist.test b/tests/objectlist.test
index 35325376ea209d9179ec312f240c973b01951bb3..9b471a885cb45704c3c50bb12fb7000962697c68 100755 (executable)
--- a/tests/objectlist.test
+++ b/tests/objectlist.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 # objectlist.test - make sure that a nonexisting objectlist file is
-# properly mentioned
+# properly mentioned and that the argument may contain spaces.
 
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
@@ -28,10 +28,19 @@
 linkresult=`$LIBTOOL -n --mode=link $CC -objectlist nonexistant 2>&1`
 test $? -eq 0 && exit $EXIT_FAILURE
 
-echo ".$linkresult."
 echo "$linkresult" | ${EGREP} "nonexistant" >/dev/null 2>&1 && {
   func_msg "$progname: error message contains -objectlist argument as expected"
-  exit $EXIT_SUCCESS
-}
+}  || exit $EXIT_FAILURE
 
-exit $EXIT_FAILURE
+
+objlist="object list with spaces"
+: > "$objlist"
+linkresult=`$LIBTOOL -n --mode=link $CC -o a.out -objectlist "$objlist" 2>&1`
+rm -f "$objlist"
+
+echo "$linkresult" | ${EGREP} "spaces" >/dev/null 2>&1 && {
+  func_msg "$progname: -objectlist with spaces in filename not recognized."
+  exit $EXIT_FAILURE
+} 
+
+exit $EXIT_SUCCESS