* libtool.m4: If ld is being used on IRIX to embed the

runtmie path, use -rpath, not -Wl,-rpath. Embed the runtime
path into libraries for AIX (supported on AIX 4.3.2+).
Embed the runtime path into Tru64 libraries, even though it
doesn't make much sense unless using Tru64 UNIX 5.1 with a
specific patch and >5.1.

diff --git a/ChangeLog b/ChangeLog
index c3bab64e85b3b647144d9fbf402c1aff2698d0bf..4d66c59b848636d07c0e99777ea3137a26afa536 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-10-14  Albert Chin-A-Young  <china@thewrittenword.com>
+
+       * libtool.m4: If ld is being used on IRIX to embed the
+       runtmie path, use -rpath, not -Wl,-rpath. Embed the runtime
+       path into libraries for AIX (supported on AIX 4.3.2+).
+       Embed the runtime path into Tru64 libraries, even though it
+       doesn't make much sense unless using Tru64 UNIX 5.1 with a
+       specific patch and >5.1.
+
 2002-10-11 Albert Chin-A-Young  <china@thewrittenword.com>
 
        * libtool.m4 (aix): When LDFLAGS="-Wl,-brtl,[other options]",

diff --git a/libtool.m4 b/libtool.m4
index 682994aee60a75730f226d09a6d57a9261eb0781..063f03afe1a28df8716b7f62c398cb4f33f4a0ae 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -1640,10 +1640,11 @@ else
   irix5* | irix6* | nonstopux*)
     if test "$GCC" = yes; then
       archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
     else
       archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+      hardcode_libdir_flag_spec='-rpath $libdir'
     fi
-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
     hardcode_libdir_separator=:
     link_all_deplibs=yes
     ;;
@@ -2000,6 +2001,7 @@ aix4* | aix5*)
     fi
     shlibpath_var=LIBPATH
   fi
+  hardcode_into_libs=yes
   ;;
 
 amigaos*)
@@ -2249,6 +2251,7 @@ osf3* | osf4* | osf5*)
   shlibpath_var=LD_LIBRARY_PATH
   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+  hardcode_into_libs=yes
   ;;
 
 sco3.2v5*)