From 2d860a8b7d9de89b5f4a2d0cec5271b2a70cb19a Mon Sep 17 00:00:00 2001
From: Albert Chin-A-Young <china@thewrittenword.com>
Date: Wed, 24 Mar 2004 03:12:21 +0000
Subject: [PATCH] * m4/libtool.m4: Add new variable, inherit_rpath, if the

* m4/libtool.m4: When linking convenience libraries on Solaris
---
 ChangeLog     |  8 +++++++-
 m4/libtool.m4 | 11 ++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 81ed1eec..71c251f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 2004-03-24  Albert Chin-A-Young  <china@thewrittenword.com>
 
-	* libtool.m4: When linking convenience libraries on Solaris
+	* m4/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.
+
+	* m4/libtool.m4: When linking convenience libraries on Solaris
 	with the Sun C++ compiler, pass convenience libraries through
 	to the linker with -Qoption between allextract/defaultextract.
 	The Sun C++ compiler bundles -Qoption arguments so
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 5346bf4c..ecc8ce7f 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1490,7 +1490,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 ||
@@ -3400,6 +3401,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)=
@@ -3913,6 +3915,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
       ;;
 
@@ -4238,6 +4241,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],
@@ -4379,6 +4385,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _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
@@ -4859,6 +4866,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
@@ -5421,6 +5429,7 @@ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _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