* 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 6c33ac5ab2c1824ecc3a09f321945b7b08acc1a7..500675fe85b06d14dd7c75245d6711883bd26999 100644 (file)
--- 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 1f06caf6d29091378c197e2703daf8c53f1f3af9..40a5ff1c8b1141e2e1a84abf2bb0c998047a4bd2 100644 (file)
--- 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,