* libtool.m4 (_LT_AC_LANG_CXX_CONFIG, AC_LIBTOOL_PROG_LD_SHLIBS)

[ hpux11 ]: Pass +nodefaultrpath when linking on ia64*.

diff --git a/ChangeLog b/ChangeLog
index 73f3d37a77eb470f1b719a76e1dee9815f1841b3..da8feb46b6cf6e925a70b34e1a979aea9062b0a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-14  Albert Chin  <china@thewrittenword.com>
+
+       * libtool.m4 (_LT_AC_LANG_CXX_CONFIG, AC_LIBTOOL_PROG_LD_SHLIBS)
+       [ hpux11 ]: Pass +nodefaultrpath when linking on ia64*.
+
 2005-11-13  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * libtool.m4 (AC_LIBTOOL_LANG_C_CONFIG):
@@ -17,7 +22,7 @@
 2005-11-13  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
        * tests/quote.test: Do not fail on harmless shell bug present
-       in some ksh88 versions.
+       in some ksh versions.
        Reported by Tim Rice <tim@multitalents.net> and others.
 
 2005-11-13  Albert Chin-A-Young  <china@thewrittenword.com>

diff --git a/libtool.m4 b/libtool.m4
index 028c8b045f0028f6f3a64fe197a4a2cf0bdbad75..6ae2206462d048887425aebe12fe07bb517a993b 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -3153,9 +3153,12 @@ case $host_os in
        ;;
       aCC*)
        case $host_cpu in
-       hppa*64*|ia64*)
+       hppa*64*)
          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
          ;;
+       ia64*)
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+         ;;
        *)
          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
          ;;
@@ -3174,9 +3177,12 @@ case $host_os in
        if test "$GXX" = yes; then
          if test $with_gnu_ld = no; then
            case $host_cpu in
-           ia64*|hppa*64*)
+           hppa*64*)
              _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
              ;;
+           ia64*)
+             _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+             ;;
            *)
              _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
              ;;
@@ -5834,18 +5840,24 @@ _LT_EOF
     hpux11*)
       if test "$GCC" = yes -a "$with_gnu_ld" = no; then
        case $host_cpu in
-       hppa*64*|ia64*)
+       hppa*64*)
          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
          ;;
+       ia64*)
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
        *)
          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
          ;;
        esac
       else
        case $host_cpu in
-       hppa*64*|ia64*)
+       hppa*64*)
          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
          ;;
+       ia64*)
+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+         ;;
        *)
          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
          ;;