From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 14 Mar 2004 15:05:37 +0000 (+0000)
Subject: * m4/libtool.m4: Remove newlines from lt_ld_extra, so
X-Git-Tag: release-1-9b~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8c95f4d9ffd324061a2a3f4ee7a6ba0cf8bb230;p=thirdparty%2Flibtool.git

* m4/libtool.m4: Remove newlines from lt_ld_extra, so
variable can safely be stored in config.cache.
---

diff --git a/ChangeLog b/ChangeLog
index 25903d787..3f825d340 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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  Michael Pruett  <michael@68k.org>
 
 	* m4/libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS0 [irix]: Define
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 06b7c9afa..152929391 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1831,7 +1831,7 @@ linux*)
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf`
+    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