From: Scott James Remnant <scott@netsplit.com>
Date: Fri, 23 Jan 2004 06:03:17 +0000 (+0000)
Subject: * m4/libtool.m4  (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [linux]: Include
X-Git-Tag: release-1-5-2~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c1463c222072ef8820eebc6bb5f7cd0aebf799fa;p=thirdparty%2Flibtool.git

* m4/libtool.m4  (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [linux]: Include
directories found in /etc/ld.so.conf in sys_lib_dlsearch_path_spec.
---

diff --git a/ChangeLog b/ChangeLog
index 6c33ac5ab..500675fe8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-23  Scott James Remnant  <scott@netsplit.com>
+
+	* m4/libtool.m4  (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [linux]: Include
+	directories found in /etc/ld.so.conf in sys_lib_dlsearch_path_spec.
+
 2004-01-23  Scott James Remnant  <scott@netsplit.com>
 
 	* ltmain.in: Add -pthread and similar to $deplibs ($compile_deplibs
diff --git a/libtool.m4 b/libtool.m4
index 1f06caf6d..40a5ff1c8 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -1441,6 +1441,12 @@ linux*)
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # 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"
+  fi
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,