* libtool.m4 (AC_LIBTOOL_PROG_LD_SHLIBS): Move setting of

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

diff --git a/libtool.m4 b/libtool.m4
index 86dfb99c5c75a32da5988389dac14fc4f7a4d2a7..5c08f7d6b8ad15a29bc4a7dfdb262c8337a51bf6 100644 (file)
--- a/libtool.m4
+++ b/libtool.m4
@@ -1743,6 +1743,11 @@ 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
 ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
 
 
@@ -6064,11 +6069,6 @@ EOF
 AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
 test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = 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
-
 #
 # Do we need to explicitly link libc?
 #