Re: [PATCH (the *proper* one this time)] add /usr/X11R6/lib and /usr/local/lib to Linux sys_lib_dlsearch_path_spec

[Scott James Remnant]

On Fri, 2003-10-31 at 13:12, Scott James Remnant wrote:

> This adds /usr/X11R6/lib and /usr/local/lib to the Linux run-time system
> search path for libraries (sys_lib_dlsearch_path_spec), so they don't
> get hardcoded rpaths.
> 
Scratch this patch, instead use the one attached.  It's more portable
between different distributions.

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-03 03:25:20.000000000 +0000
@@ -0,0 +1,6 @@
+2003-11-02  Scott James Remnant  <address@hidden>
+
+       * m4/libtool.m4 (Linux): Append contents of /etc/ld.so.conf
+       to sys_lib_dlsearch_path_spec if that file exists, so we
+       don't harcode these library paths.
+
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-03 03:24:19.000000000 +0000
@@ -1481,6 +1481,11 @@ 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 "`cat /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,

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