* libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS): Move setting of

`variables_saved_for_relink'..
(_LT_SYS_DYNAMIC_LINKER): here, when both `shlibpath_var'
and `runpath_var' have been set.
Reported by Mike Frysinger <vapier@gentoo.org>.

diff --git a/ChangeLog b/ChangeLog
index 7e243af27fdbfebedc531428f4acc2ff4ae2d4ef..eb0c6405c909a4db85c84b2abb6260cdb158a50e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-11-09  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
+       * libltdl/m4/libtool.m4 (_LT_LINKER_SHLIBS): Move setting of
+       `variables_saved_for_relink'..
+       (_LT_SYS_DYNAMIC_LINKER): here, when both `shlibpath_var'
+       and `runpath_var' have been set.
+       Reported by Mike Frysinger <vapier@gentoo.org>.
+
        * libltdl/Makefile.inc (AM_CPPFLAGS): Do not define
        HAVE_CONFIG_H.
        * libltdl/m4/ltdl.m4 (LTDL_INIT): Do not invoke

diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 8382228820bc2cd8951bad21ee3fd44c9a437864..3c6fab4cffb72e940375bdb8e630243bb93db0ae 100644 (file)
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -2452,6 +2452,15 @@ uts4*)
 esac
 AC_MSG_RESULT([$dynamic_linker])
 test "$dynamic_linker" = no && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test "$GCC" = yes; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
 _LT_DECL([], [need_lib_prefix], [0],
     [Do we need the "lib" prefix for modules?])
 _LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
@@ -4684,14 +4693,6 @@ _LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
 _LT_DECL([], [extract_expsyms_cmds], [2],
     [The commands to extract the exported symbol list from a shared archive])
 
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-_LT_DECL([], [variables_saved_for_relink], [1],
-    [Variables whose values should be saved in libtool wrapper scripts and
-    restored at link time])
-
 #
 # Do we need to explicitly link libc?
 #