FYI: darwin link order patch

[Peter O'Gorman]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

The following patches were applied to the stable branch and HEAD.

Thanks,
Peter
- --
Peter O'Gorman - http://www.pogma.com

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Darwin)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iQCVAwUBQFRuQriDAg3OZTLPAQI2HQQAmRH8tlp5eXZp4FjRHW8Y8gNJqWvpSpgg
OjeI2SjH9/JDHhZNvR9JQaJ13FTUx6R70E1wlamzqxBNY74uEITQZZEEVokTqpnG
+Pf+SxRy5lvLPXVcF1lZDX2SXDjMug+n/wjWsF0We/Lj6chZar7OYuEQMuvW8x2Q
izadCLs59rQ=
=aOFN
-----END PGP SIGNATURE-----

Index: ChangeLog
2004-03-11  Peter O'Gorman  <address@hidden>

        * ltmain.in (link_all_deplibs,darwin): Link libraries in the
        correct order. Bug from Zachary Pincus <address@hidden>.

from  David Edelsohn  <address@hidden>
Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/ltmain.in,v
retrieving revision 1.388
diff -u -3 -p -u -r1.388 ltmain.in
--- ltmain.in 23 Feb 2004 16:59:14 -0000 1.388
+++ ltmain.in 11 Mar 2004 15:08:53 -0000
@@ -2775,7 +2775,7 @@ EOF
              esac
              case " $deplibs " in
              *" $depdepl "*) ;;
-             *) deplibs="$deplibs $depdepl" ;;
+             *) deplibs="$depdepl $deplibs" ;;
              esac
              case " $deplibs " in
              *" $path "*) ;;

Index: ChangeLog
2004-03-14  Peter O'Gorman  <address@hidden>

        * ltmain.in (link_all_deplibs,darwin): Link libraries in the
        correct order. Bug from Zachary Pincus <address@hidden>.

from  David Edelsohn  <address@hidden>
Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/ltmain.in,v
retrieving revision 1.334.2.27
diff -u -3 -p -u -r1.334.2.27 ltmain.in
--- ltmain.in 15 Feb 2004 13:22:05 -0000 1.334.2.27
+++ ltmain.in 14 Mar 2004 14:05:37 -0000
@@ -2672,7 +2672,7 @@ EOF
              esac
              case " $deplibs " in
              *" $depdepl "*) ;;
-             *) deplibs="$deplibs $depdepl" ;;
+             *) deplibs="$depdepl $deplibs" ;;
              esac
              case " $deplibs " in
              *" $path "*) ;;

Index: ChangeLog
2004-03-14  Peter O'Gorman  <address@hidden>

        * ltmain.in: Use $EGREP, $GREP is not set.

from  David Edelsohn  <address@hidden>
Index: ltmain.in
===================================================================
RCS file: /cvsroot/libtool/libtool/ltmain.in,v
retrieving revision 1.334.2.27
diff -u -3 -p -u -r1.334.2.27 ltmain.in
--- ltmain.in 15 Feb 2004 13:22:05 -0000 1.334.2.27
+++ ltmain.in 14 Mar 2004 13:58:06 -0000
@@ -2387,7 +2387,7 @@ EOF
                  *-*-darwin* )
                    # if the lib is a module then we can not link against
                    # it, someone is ignoring the new warnings I added
-                   if /usr/bin/file -L $add 2> /dev/null | $GREP "bundle" 
>/dev/null ; then
+                   if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" 
>/dev/null ; then
                      $echo "** Warning, lib $linklib is a module, not a shared 
library"
                      if test -z "$old_library" ; then
                        $echo