Search the compiler path too.

* libltdl/m4/libtool.m4 (compiler_lib_search_dirs): New variable.
* libltdl/config/ltmain.m4sh: Use it.
Reported by Maynard Johnson

diff --git a/ChangeLog b/ChangeLog
index dda0b3b9c11b8cc6c380e481ad76e613b94b605b..011a8f94f01f42799fb91f19d01756774117aa5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-29  Peter O'Gorman  <peter@pogma.com>
+
+       Search the compiler path too.
+       * libltdl/m4/libtool.m4 (compiler_lib_search_dirs): New variable.
+       * libltdl/config/ltmain.m4sh: Use it.
+       Reported by Maynard Johnson
+
 2008-01-28  Gary V. Vaughan  <gary@gnu.org>
 
        * libtoolize.m4sh (func_check_macros): Correct typo with

diff --git a/libltdl/config/ltmain.m4sh b/libltdl/config/ltmain.m4sh
index 649f1b35030deb7ee92675ba588ce85f860afc62..1fc5a3bca65f59f1901fa7cf00708452256e77b2 100644 (file)
--- a/libltdl/config/ltmain.m4sh
+++ b/libltdl/config/ltmain.m4sh
@@ -4103,7 +4103,12 @@ func_mode_link ()
          fi
          func_stripname '-l' '' "$deplib"
          name=$func_stripname_result
-         for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+         if test "$linkmode" = lib; then
+           searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+         else
+           searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+         fi
+         for searchdir in $searchdirs; do
            for search_ext in .la $std_shrext .so .a; do
              # Search the libtool library
              lib="$searchdir/lib${name}${search_ext}"

diff --git a/libltdl/m4/libtool.m4 b/libltdl/m4/libtool.m4
index 6fb01d5da22e846e208f4d3524ec14146061414d..14f317d26025822152027bf3f33e1845feda6d72 100644 (file)
--- a/libltdl/m4/libtool.m4
+++ b/libltdl/m4/libtool.m4
@@ -6471,6 +6471,12 @@ esac
 case " $_LT_TAGVAR(postdeps, $1) " in
 *" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
 esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "$${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
 _LT_TAGDECL([], [predep_objects], [1],
     [Dependencies to place before and after the objects being linked to
     create a shared library])