* 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 8779e1d858179514e6e20478adb26e41ffbd7d09..1f9fc07b7b68decddb16068b63cf0d7b914aadb7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-24  Peter O'Gorman  <peter@pogma.com>
+
+       * 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  <ebb9@byu.net>
 
        Add proper quoting to doc examples.

diff --git a/doc/notes.texi b/doc/notes.texi
index b233bb72d04a255ff8a81ef9c20ac05a0d8dbbf8..e3fbb96c87b7dbe378cea547063fdcdaa8597d3b 100644 (file)
--- 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 d3a307b504ec5a04c29b5f61ae5e2a32b74a277f..6fb01d5da22e846e208f4d3524ec14146061414d 100644 (file)
--- 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