Ralf Wildenhues wrote:
> Hi Peter,
>
> * Peter O'Gorman wrote on Mon, Jan 21, 2008 at 07:29:08PM CET:
>> I give up on trying to find fancy ways to set the paths, ok to apply
>> this to branch-1-5 (and similar for HEAD)?
>
> I suppose, yes, but I guess some mention in the documentation would not
> be bad.
Committed these,
Thanks,
Peter
--
Peter O'Gorman
http://pogma.com
Index: ChangeLog
===================================================================
RCS file: /sources/libtool/libtool/ChangeLog,v
retrieving revision 1.1220.2.486
diff -u -r1.1220.2.486 ChangeLog
--- ChangeLog 21 Jan 2008 17:47:50 -0000 1.1220.2.486
+++ ChangeLog 24 Jan 2008 06:52:12 -0000
@@ -1,3 +1,9 @@
+2008-01-24 Peter O'Gorman <[EMAIL PROTECTED]>
+
+ * 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.
+
2008-01-21 Peter O'Gorman <[EMAIL PROTECTED]>
* ltmain.in [darwin]: look in libdir for dependent libraries, the .la
Index: libtool.m4
===================================================================
RCS file: /sources/libtool/libtool/Attic/libtool.m4,v
retrieving revision 1.314.2.192
diff -u -r1.314.2.192 libtool.m4
--- libtool.m4 11 Jan 2008 19:15:57 -0000 1.314.2.192
+++ libtool.m4 24 Jan 2008 06:52:16 -0000
@@ -1817,6 +1817,13 @@
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
+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"
+
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"
? compiler_search.patch
Index: ChangeLog
===================================================================
RCS file: /sources/libtool/libtool/ChangeLog,v
retrieving revision 1.2567
diff -u -r1.2567 ChangeLog
--- ChangeLog 24 Jan 2008 04:08:37 -0000 1.2567
+++ ChangeLog 24 Jan 2008 06:54:22 -0000
@@ -1,3 +1,10 @@
+2008-01-24 Peter O'Gorman <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
Add proper quoting to doc examples.
Index: doc/notes.texi
===================================================================
RCS file: /sources/libtool/libtool/doc/notes.texi,v
retrieving revision 1.4
diff -u -r1.4 notes.texi
--- doc/notes.texi 14 Jan 2008 21:34:19 -0000 1.4
+++ doc/notes.texi 24 Jan 2008 06:54:22 -0000
@@ -67,4 +67,14 @@
to use autoconf-mode, which is distributed with GNU Emacs 21, Autoconf itself,
and all recent releases of XEmacs.
[EMAIL PROTECTED]
+When building on some linux systems for multilib targets
[EMAIL PROTECTED] 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
[EMAIL PROTECTED] cache variables
[EMAIL PROTECTED] and
[EMAIL PROTECTED] respectively to the correct search
+paths.
+
@end itemize
Index: libltdl/m4/libtool.m4
===================================================================
RCS file: /sources/libtool/libtool/libltdl/m4/libtool.m4,v
retrieving revision 1.130
diff -u -r1.130 libtool.m4
--- libltdl/m4/libtool.m4 16 Jan 2008 14:49:40 -0000 1.130
+++ libltdl/m4/libtool.m4 24 Jan 2008 06:54:27 -0000
@@ -2663,6 +2663,13 @@
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
_______________________________________________
http://lists.gnu.org/mailman/listinfo/libtool
