* m4/libtool.m4: Remove newlines from lt_ld_extra, so

variable can safely be stored in config.cache.

* m4/libtool.m4: Rename ld_extra to lt_lt_extra to be consistent
with HEAD.

diff --git a/ChangeLog b/ChangeLog
index 869119da31a6925e569fcf44b5b06bbb477aaf25..7fe098c32a89a7ec4a7f051572512aeddcb67d52 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-03-14  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       * m4/libtool.m4: Remove newlines from lt_ld_extra, so
+       variable can safely be stored in config.cache.
+
+2004-03-14  Scott James Remnant  <scott@netsplit.com>
+
+       * m4/libtool.m4: Rename ld_extra to lt_lt_extra to be consistent
+       with HEAD.
+
 2004-03-14  Peter O'Gorman  <peter@pogma.com>
 
        * ltmain.in: Use $EGREP, $GREP is not set.

diff --git a/libtool.m4 b/libtool.m4
index f141bcc5b50c0df6c7ef74099675a2fd8ee90296..16f90d7b2b59f2461f1a9ebf0ffb1f69f0d22350 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -1443,8 +1443,8 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $ld_extra"
+    lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on