From: Peter O'Gorman Date: Thu, 24 Jan 2008 06:55:36 +0000 (+0000) Subject: * libltdl/m4/libtool.m4 (sys_lib_search_path_spec, X-Git-Tag: release-2-1b~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8add91359a423c8c1be0ffa072e54c4ae1734a50;p=thirdparty%2Flibtool.git * libltdl/m4/libtool.m4 (sys_lib_search_path_spec, sys_lib_dlsearch_path_spec): Allow for a cache variable lt_cv_sys_lib_... to set these at configure time. * doc/notes.texi: Short note about the above change. --- diff --git a/ChangeLog b/ChangeLog index 8779e1d85..1f9fc07b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-01-24 Peter O'Gorman + + * libltdl/m4/libtool.m4 (sys_lib_search_path_spec, + sys_lib_dlsearch_path_spec): Allow for a cache variable + lt_cv_sys_lib_... to set these at configure time. + * doc/notes.texi: Short note about the above change. + 2008-01-24 Eric Blake Add proper quoting to doc examples. diff --git a/doc/notes.texi b/doc/notes.texi index b233bb72d..e3fbb96c8 100644 --- a/doc/notes.texi +++ b/doc/notes.texi @@ -67,4 +67,14 @@ and an old version of @command{gcc} provided by Marco Walther. to use autoconf-mode, which is distributed with GNU Emacs 21, Autoconf itself, and all recent releases of XEmacs. +@item +When building on some linux systems for multilib targets +@command{libtool} sometimes guesses the wrong paths that the linker +and dynamic linker search by default. If this occurs, you may override +libtool's guesses at @command{configure} time by setting the +@command{autoconf} cache variables +@code{lt_cv_sys_lib_search_path_spec} and +@code{sys_lib_dlsearch_path_spec} respectively to the correct search +paths. + @end itemize diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4 index d3a307b50..6fb01d5da 100644 --- a/libltdl/m4/libtool.m4 +++ b/libltdl/m4/libtool.m4 @@ -2663,6 +2663,13 @@ 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_CACHE_VAL([lt_cv_sys_lib_search_path_spec], +[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"]) +sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" +AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec], +[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"]) +sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" _LT_DECL([], [variables_saved_for_relink], [1], [Variables whose values should be saved in libtool wrapper scripts and