[PATCH] add /etc/ld.so.conf contents to sys_lib_dlsearch_path_spec

[Scott James Remnant]

Ok, the third attempt at this bit of functionality.  I think I've got
the ld.so.conf possible formats correct, so this will append every
directory found there to sys_lib_dlsearch_path_spec.

Scott
-- 
Have you ever, ever felt like this?
Had strange things happen?  Are you going round the twist?

diff -ruNp libtool-CVS~/ChangeLog libtool-CVS/ChangeLog
--- libtool-CVS~/ChangeLog      2003-10-30 14:40:11.000000000 +0000
+++ libtool-CVS/ChangeLog       2003-11-07 20:50:52.000000000 +0000
@@ -0,0 +1,5 @@
+2003-11-07  Scott James Remnant  <address@hidden>
+
+       * m4/libtool.m4  (AC_LIBTOOL_SYS_DYNAMIC_LINKER) [Linux]: Include
+       directories found in /etc/ld.so.conf in sys_lib_dlsearch_path_spec.
+
diff -ruNp libtool-CVS~/m4/libtool.m4 libtool-CVS/m4/libtool.m4
--- libtool-CVS~/m4/libtool.m4  2003-10-30 14:28:00.000000000 +0000
+++ libtool-CVS/m4/libtool.m4   2003-11-07 20:51:26.000000000 +0000
@@ -1481,6 +1481,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
+    sys_lib_dlsearch_path_spec="/lib /usr/lib "\
+       `$SED -e 's/=[^=]*$//' -e 's/[:,        ]/ /g' /etc/ld.so.conf`
+  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,
diff -ruNp libtool-CVS~/NEWS libtool-CVS/NEWS
--- libtool-CVS~/NEWS   2003-10-21 16:03:54.000000000 +0100
+++ libtool-CVS/NEWS    2003-11-07 20:52:33.000000000 +0000
@@ -15,6 +15,7 @@ New in 1.5b: 2003-??-??; CVS version 1.5
 * 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.

signature.asc
Description: This is a digitally signed message part