From 47d93a30e4b8bda20dd27980fa1582d343fe80f0 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sun, 14 Mar 2004 15:07:47 +0000 Subject: [PATCH] * 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. --- ChangeLog | 10 ++++++++++ libtool.m4 | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 869119da3..7fe098c32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2004-03-14 Ralf Wildenhues + + * m4/libtool.m4: Remove newlines from lt_ld_extra, so + variable can safely be stored in config.cache. + +2004-03-14 Scott James Remnant + + * m4/libtool.m4: Rename ld_extra to lt_lt_extra to be consistent + with HEAD. + 2004-03-14 Peter O'Gorman * ltmain.in: Use $EGREP, $GREP is not set. diff --git a/libtool.m4 b/libtool.m4 index f141bcc5b..16f90d7b2 100644 --- 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 -- 2.47.3