Re: Add new variable inherit_rpath to branch-1-5

[Albert Chin]

On Sun, Mar 14, 2004 at 02:37:54PM +0000, Scott James Remnant wrote:
> On Wed, 2004-02-11 at 16:49, Albert Chin wrote:
> 
> > This patch fixes:
> >   http://mail.gnu.org/archive/html/libtool/2003-07/msg00086.html
>
> Can you re-work this patch for the current Libtool HEAD ... things have
> shifted a bit too much for it to apply cleanly, and I'm not entirely
> sure I've got my merge right here.
> 
> Otherwise it looks good,

Attached.

-- 
albert chin (address@hidden)

--snip snip
2004-03-14  Albert Chin-A-Young  <address@hidden>

        * libtool.m4: Add new variable, inherit_rpath, if the
        RPATHs of the libraries being linked are inherited in
        the output file. For systems with a linker exhibiting
        this feature, programs/libraries must be relinked at
        installation time.

Index: m4/libtool.m4
===================================================================
RCS file: /cvsroot/libtool/libtool/m4/libtool.m4,v
retrieving revision 1.51
diff -u -3 -p -r1.51 libtool.m4
--- m4/libtool.m4       14 Mar 2004 15:05:37 -0000      1.51
+++ m4/libtool.m4       14 Mar 2004 18:25:28 -0000
@@ -1415,7 +1415,8 @@ else
 fi
 AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
 
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink ||
+   test "$_LT_AC_TAGVAR(inherit_rpath, $1)" = yes; then
   # Fast installation is not supported
   enable_fast_install=no
 elif test "$shlibpath_overrides_runpath" = yes ||
@@ -3406,6 +3407,7 @@ m4_if([$1], [CXX], [
   _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
   _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_AC_TAGVAR(inherit_rpath, $1)=no
   _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
   _LT_AC_TAGVAR(module_cmds, $1)=
   _LT_AC_TAGVAR(module_expsym_cmds, $1)=
@@ -3919,6 +3921,7 @@ _LT_EOF
       fi
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
       _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_AC_TAGVAR(inherit_rpath, $1)=yes
       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
       ;;
 
@@ -4244,6 +4247,9 @@ _LT_TAGDECL([], [hardcode_automatic], [0
     [Set to "yes" if building a shared library automatically hardcodes DIR
     into the library and all subsequent libraries and executables linked
     against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
 _LT_TAGDECL([], [link_all_deplibs], [0],
     [Whether libtool must link a program against all its dependency libraries])
 _LT_TAGDECL([], [fix_srcfile_path], [1],
@@ -4450,6 +4456,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_
 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
 _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(inherit_rpath, $1)=no
 _LT_AC_TAGVAR(module_cmds, $1)=
 _LT_AC_TAGVAR(module_expsym_cmds, $1)=
 _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
@@ -4930,6 +4937,7 @@ case $host_os in
     esac
     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+    _LT_AC_TAGVAR(inherit_rpath, $1)=yes
     ;;
   linux*)
     case $cc_basename in
@@ -5489,6 +5501,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_
 _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
 _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+_LT_AC_TAGVAR(inherit_rpath, $1)=no
 _LT_AC_TAGVAR(module_cmds, $1)=
 _LT_AC_TAGVAR(module_expsym_cmds, $1)=
 _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown