FYI: branch-1-5: Move uninstalled -L paths to front (was: libtool "no symlinked libs" patch)

[Ralf Wildenhues]

[ moving from the ports at openbsd, and libtool lists ]

> * Jacob Meuser wrote on Tue, Nov 29, 2005 at 05:19:44AM CET:
> > > Ralf Wildenhues wrote:
> > > 
> > > | 1) Move all paths to uninstalled libraries (in the correct order) before

Applied to branch-1-5 as below.  Haven't found time to redo it yet,
sorry.  (This also means that on systems with yet other hardcode
behavior this uninstalled libs issue is still present :-/ ).

Cheers,
Ralf

2005-12-18  Jacob Meuser <address@hidden>,
            Ralf Wildenhues <address@hidden>

        * ltmain.in (link mode): Move library search paths that coincide
        with paths to not yet installed libraries to the beginning of
        the library search list.

Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/Attic/ltmain.in,v
retrieving revision 1.334.2.111
diff -u -r1.334.2.111 ltmain.in
--- ltmain.in   18 Dec 2005 12:26:53 -0000      1.334.2.111
+++ ltmain.in   18 Dec 2005 17:53:31 -0000
@@ -3767,6 +3767,35 @@
        deplibs=$newdeplibs
       fi
 
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+       case " $new_libs " in
+       *" -L$path/$objdir "*) ;;
+       *)
+         case " $deplibs " in
+         *" -L$path/$objdir "*)
+           new_libs="$new_libs -L$path/$objdir" ;;
+         esac
+         ;;
+       esac
+      done
+      for deplib in $deplibs; do
+       case $deplib in
+       -L*)
+         case " $new_libs " in
+         *" $deplib "*) ;;
+         *) new_libs="$new_libs $deplib" ;;
+         esac
+         ;;
+       *) new_libs="$new_libs $deplib" ;;
+       esac
+      done
+      deplibs="$new_libs"
+
+
       # All the library-specific variables (install_libdir is set above).
       library_names=
       old_library=
@@ -4281,6 +4310,35 @@
         ;;
       esac
 
+
+      # move library search paths that coincide with paths to not yet
+      # installed libraries to the beginning of the library search list
+      new_libs=
+      for path in $notinst_path; do
+       case " $new_libs " in
+       *" -L$path/$objdir "*) ;;
+       *)
+         case " $compile_deplibs " in
+         *" -L$path/$objdir "*)
+           new_libs="$new_libs -L$path/$objdir" ;;
+         esac
+         ;;
+       esac
+      done
+      for deplib in $compile_deplibs; do
+       case $deplib in
+       -L*)
+         case " $new_libs " in
+         *" $deplib "*) ;;
+         *) new_libs="$new_libs $deplib" ;;
+         esac
+         ;;
+       *) new_libs="$new_libs $deplib" ;;
+       esac
+      done
+      compile_deplibs="$new_libs"
+
+
       compile_command="$compile_command $compile_deplibs"
       finalize_command="$finalize_command $finalize_deplibs"