[PATCH] Don't drop -L during prog,link pass

[Scott James Remnant]

This patch fixes the problem where Libtool would favour libraries with
.la files even though they appeared later in the search path than
non-libtool libraries of the same names.

Basically the -L pointing at the right place was only being considered
during the scan pass, this patch makes it be considered at other times
too and thus fixes the bug.

Okay to apply?

Scott
-- 
Have you ever, ever felt like this?
Had strange things happen?  Are you going round the twist?

diff -ruNp libtool-CVS~/ChangeLog libtool-CVS/ChangeLog
--- libtool-CVS~/ChangeLog      2004-03-23 19:31:28.000000000 +0000
+++ libtool-CVS/ChangeLog       2004-03-24 02:03:16.000000000 +0000
@@ -0,0 +1,6 @@
+2004-03-24  Scott James Remnant  <address@hidden>
+
+       * ltmain.in <prog linkmode>: Always add -L options to
+       $newlib_search_path instead of just in scan mode to ensure that
+       non-libtool libraries in user-specified directories can be found.
+
diff -ruNp libtool-CVS~/ltmain.in libtool-CVS/ltmain.in
--- libtool-CVS~/ltmain.in      2004-03-14 14:36:54.000000000 +0000
+++ libtool-CVS/ltmain.in       2004-03-24 02:00:26.000000000 +0000
@@ -2024,11 +2024,11 @@ EOF
            fi
            if test "$pass" = scan; then
              deplibs="$deplib $deplibs"
-             newlib_search_path="$newlib_search_path "`$echo "X$deplib" | 
$Xsed -e 's/^-L//'`
            else
              compile_deplibs="$deplib $compile_deplibs"
              finalize_deplibs="$deplib $finalize_deplibs"
            fi
+           newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed 
-e 's/^-L//'`
            ;;
          *)
            $echo "$modename: warning: \`-L' is ignored for archives/objects" 
1>&2

signature.asc
Description: This is a digitally signed message part