* libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS)

(_LT_LANG_CXX_CONFIG) [ hpux10, hpux11 ]:
hardcode_libdir_flag_spec and hardcode_minus_L are the same for
hppa*64 and ia64*. Don't set
hardcode_libdir_flag_spec='-L$libdir' on ia64* because if you
specify +b and -L, +b overrides what is set into DT_RPATH.

diff --git a/ChangeLog b/ChangeLog
index 34074b2282dee0b12546bf19fb93d4cecabe4165..020126ec7484113ab7403b0064c6ee35766a85f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-11-07  Albert Chin-A-Young  <china@thewrittenword.com>
+
+       * libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS)
+       (_LT_LANG_CXX_CONFIG) [ hpux10, hpux11 ]:
+       hardcode_libdir_flag_spec and hardcode_minus_L are the same for
+       hppa*64 and ia64*. Don't set
+       hardcode_libdir_flag_spec='-L$libdir' on ia64* because if you
+       specify +b and -L, +b overrides what is set into DT_RPATH.
+
 2005-11-07  Gary V. Vaughan  <gary@gnu.org>
 
        * tests/testsuite.at (_LTDL_PROJECT_FILES): Factored out from

diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index b0378912ad39ad917df1b87d5a05958a84567495..8382228820bc2cd8951bad21ee3fd44c9a437864 100644 (file)
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -4393,25 +4393,15 @@ _LT_EOF
        esac
       fi
       if test "$with_gnu_ld" = no; then
+       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+       _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
        case $host_cpu in
-       hppa*64*)
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+       hppa*64*|ia64*)
          _LT_TAGVAR(hardcode_direct, $1)=no
          _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
          ;;
-       ia64*)
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-         _LT_TAGVAR(hardcode_direct, $1)=no
-         _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-
-         # hardcode_minus_L: Not really in the search PATH,
-         # but as the default location of the library.
-         _LT_TAGVAR(hardcode_minus_L, $1)=yes
-         ;;
        *)
-         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
          _LT_TAGVAR(hardcode_direct, $1)=yes
          _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 
@@ -5407,33 +5397,22 @@ if test "$_lt_caught_CXX_error" != yes; then
 
       hpux10*|hpux11*)
         if test $with_gnu_ld = no; then
+         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+         _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
           case $host_cpu in
-            hppa*64*)
-             _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-             _LT_TAGVAR(hardcode_libdir_separator, $1)=:
-              ;;
-            ia64*)
-             _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            hppa*64*|ia64*)
               ;;
             *)
-             _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-             _LT_TAGVAR(hardcode_libdir_separator, $1)=:
              _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
               ;;
           esac
         fi
         case $host_cpu in
-          hppa*64*)
+          hppa*64*|ia64*)
             _LT_TAGVAR(hardcode_direct, $1)=no
             _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
             ;;
-          ia64*)
-            _LT_TAGVAR(hardcode_direct, $1)=no
-            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
-            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-                                                # but as the default
-                                                # location of the library.
-            ;;
           *)
             _LT_TAGVAR(hardcode_direct, $1)=yes
             _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,