[PATCH] add /usr/X11R6/lib and /usr/local/lib to Linux sys_lib_dlsearch_path_spec

[Scott James Remnant]

Just in case you were getting a bit commit-happy, here's a nasty rake in
your path!  Hahahahaha[0], or something :-)

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.

To be entirely honest, this doesn't *FIX* anything, it's a Debian
policy-itch which you're entirely free to ignore.  Then again, it
doesn't seem to break anything either (at least, not that I've heard
of).  But seeing as I'm submitting everything, here it is.

Origin: me.

Scott

[0] it's Friday, ok!
-- 
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-10-31 12:16:11.000000000 +0000
@@ -0,0 +1,5 @@
+2003-10-31  Scott James Remnant  <address@hidden>
+
+       * m4/libtool.m4: Include James Henstridge's patch to fix the
+       -export-symbols and -export-symbols-regex options under Linux.
+       
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-10-31 12:23:09.000000000 +0000
@@ -5251,6 +5251,26 @@ _LT_EOF
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
+  linux*)
+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname -o $lib'
+      case `$LD -v 2>&1` in
+        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+        *\ 2.11.*) ;; # other 2.11 versions
+        *) supports_anon_versioning=yes ;;
+      esac
+      if test "x$supports_anon_versioning" = xyes; then
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > 
$output_objdir/$libname.ver~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> 
$output_objdir/$libname.ver~$echo "local: *; };" >> 
$output_objdir/$libname.ver~$CC -shared $libobjs $deplibs $compiler_flags 
${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver 
-o $lib'
+      else
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)=$_LT_AC_TAGVAR(archive_cmds, $1)
+      fi
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
+    fi
+    ;;
+
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs 
$compiler_flags ${wl}-soname $wl$soname -o $lib'

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