* libtool.m4 (hardcode_libdir_flag_spec, osf4/osf5): Use ${wl}

to pass -rpath when compiling with gcc.
Reported by Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>

diff --git a/ChangeLog b/ChangeLog
index a1ff5446d528264623b6b5d9452651385b5a9fb0..e779f6779440ae8900e8134b6fbaadd9bd82ebce 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2001-04-08  Gary V. Vaughan  <gvv@techie.com>
 
+       * libtool.m4 (hardcode_libdir_flag_spec, osf4/osf5): Use ${wl}
+       to pass -rpath when compiling with gcc.
+       Reported by Tim Mooney <mooney@dogbert.cc.ndsu.NoDak.edu>
+
        * libltdl/ltdl.c (sys_shl_open): Cache a handle for the `self'
        module, since HPUX adds module symbols into the `self' pool if
        it is opened later.  Return the cached pointer if the caller

diff --git a/libtool.m4 b/libtool.m4
index 9ef3fd2cc4a6e1efeb33fc92d79fa21c65f9f9b4..fecc520a19ee4939875675bf11bcf8cb3c27f5e5 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -1573,14 +1573,16 @@ else
     if test "$GCC" = yes; then
       allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
       archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${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
       allow_undefined_flag=' -expect_unresolved \*'
       archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
       archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
       $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+
+      #Both c and cxx compiler support -rpath directly
+      hardcode_libdir_flag_spec='-rpath $libdir'
     fi
-#Both c and cxx compiler support -rpath directly
-    hardcode_libdir_flag_spec='-rpath $libdir'
     hardcode_libdir_separator=:
     ;;