From 9d444a66b1e9e4af601deb43b27d33e1605aaded Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <oliva@dcc.unicamp.br>
Date: Sun, 25 Apr 1999 10:22:09 +0000
Subject: [PATCH] * ltconfig.in (hpux*, hardcode_minus_L): Set to yes. (hpux*,
 hardcode_libdir_flag_spec): Do not use +s by default. (hpux*,
 shlibpath_overrides_runpath): Set to no.

---
 ChangeLog   |  4 ++++
 ltconfig.in | 21 +++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0f3662c3e..74220b02b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 1999-04-25  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+	* ltconfig.in (hpux*, hardcode_minus_L): Set to yes.
+	(hpux*, hardcode_libdir_flag_spec): Do not use +s by default.
+	(hpux*, shlibpath_overrides_runpath): Set to no.
+
 	* ltconfig.in (irix*, osf*, archive_cmds): Write so_locations
 	within objdir.
 
diff --git a/ltconfig.in b/ltconfig.in
index 7905587e7..3d8407407 100755
--- a/ltconfig.in
+++ b/ltconfig.in
@@ -1258,19 +1258,16 @@ else
     hardcode_shlibpath_var=no
     ;;
 
-  hpux9*)
-    archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib'
-    hardcode_libdir_flag_spec='${wl}+s ${wl}+b ${wl}$libdir'
-    hardcode_libdir_separator=:
-    hardcode_direct=yes
-    export_dynamic_flag_spec='${wl}-E'
-    ;;
-
-  hpux10* | hpux11*)
-    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linkopts'
-    hardcode_libdir_flag_spec='${wl}+s ${wl}+b ${wl}$libdir'
+  hpux9* | hpux10* | hpux11*)
+    case "$host_os" in
+    hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
+    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linkopts' ;;
+    esac
+    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
     hardcode_libdir_separator=:
     hardcode_direct=yes
+    hardcode_minus_L=yes # Not in the search PATH, but as the default
+			 # location of the library.
     export_dynamic_flag_spec='${wl}-E'
     ;;
 
@@ -1747,7 +1744,7 @@ hpux9* | hpux10* | hpux11*)
   need_lib_prefix=no
   need_version=no
   shlibpath_var=SHLIB_PATH
-  shlibpath_overrides_runpath=yes # +s before +b in hardcode_libdir_flag_spec
+  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
   library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
   soname_spec='${libname}${release}.sl$major'
   # HP-UX runs *really* slowly unless shared libraries are mode 555.
-- 
2.47.3