* Ralf Wildenhues wrote on Sun, Nov 06, 2005 at 07:40:19PM CET: > > OK to apply to branch-1-5 and forward-port?
Applied to branch-1-5 and HEAD, the forward-port is below. Cheers, Ralf * 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 <[EMAIL PROTECTED]>. Index: libltdl/m4/libtool.m4 =================================================================== RCS file: /cvsroot/libtool/libtool/libltdl/m4/libtool.m4,v retrieving revision 1.36 diff -u -r1.36 libtool.m4 --- libltdl/m4/libtool.m4 7 Nov 2005 18:28:25 -0000 1.36 +++ libltdl/m4/libtool.m4 9 Nov 2005 22:11:40 -0000 @@ -2452,6 +2456,15 @@ 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?]) @@ -4683,14 +4696,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?