* 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 accf2df6135243c24de41f5b570c87e2dd495825..e9c28ee545782548256f5f2221a0b86ce63add57 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-07  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.
+
 2003-11-09  Peter O'Gorman  <peter@pogma.com>
 
        * ltmain.in (linkalldeplibs,darwin): Fix a bug reported by Idar 

diff --git a/NEWS b/NEWS
index 6950f7d815a66a1954e51c5020b217a6b40f7be8..16693b95b36037c45719623d98fbb9095616e68e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,7 @@ New in 1.5b: 2003-??-??; CVS version 1.5a, Libtool team:
 * If you configure libtool with --disable-shared (or if libtool does not
   support shared libraries on your platform) trying to build a library using
   `-shared' is a fatal error.
+* Directories specified in /etc/ld.so.conf are no longer hardcoded on Linux.
 * libtoolize installs libtool.m4 (and ltdl.m4 if used) to AC_CONFIG_MACRO_DIR.
 * Mode inferrence removed, shorthand for choosing modes added.
 * Specifying -allow-undefined is now an error.

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index b91e2527e43d284cd613b0292412e8cf8ca60446..1830f8c1c7a258bba0066d1266aa0516d47806e7 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1484,6 +1484,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
+    lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf`
+    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
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,