* libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS) [ hpux10 ]:

Link with cc rather than ld (backport from HEAD).

diff --git a/ChangeLog b/ChangeLog
index ca85af8dc5ac14a2fc7b0065a017e98d8ae83bdb..530da793417dafd221ad496b6e3375af3e8df564 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-13  Albert Chin-A-Young  <china@thewrittenword.com>
+
+       * libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS) [ hpux10 ]:
+       Link with cc rather than ld (backport from HEAD).
+
 2005-11-12  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * libltdl.m4 (AC_LIBTOOL_PROG_COMPILER_PIC): `wl' is tagged

diff --git a/libtool.m4 b/libtool.m4
index b5b2613e37ea1d0c712b371470c13203a2accf24..3909a3648cb2ea56069cea65fd03bbb1d4aac31c 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -5798,7 +5798,26 @@ EOF
       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
       ;;
 
-    hpux10* | hpux11*)
+    hpux10*)
+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test "$with_gnu_ld" = no; then
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+       # hardcode_minus_L: Not really in the search PATH,
+       # but as the default location of the library.
+       _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
        case $host_cpu in
        hppa*64*|ia64*)
@@ -5811,10 +5830,10 @@ EOF
       else
        case $host_cpu in
        hppa*64*|ia64*)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
          ;;
        *)
-         _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
          ;;
        esac
       fi