[FYI] Undo parts of 87-gary-revert-mistaken-commits.patch

[Scott James Remnant]

A little too over-zealous there Gary, you backed out bits of
85-gary-fix-vcl.tmp-droppings.patch and
77ter-gary-diagnose-version-mismatch.patch as well!

Applied to HEAD.

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

diff -ruNp libtool-gary87-CVS~/ChangeLog libtool-gary87-CVS/ChangeLog
--- libtool-gary87-CVS~/ChangeLog       2004-02-12 19:22:27.000000000 +0000
+++ libtool-gary87-CVS/ChangeLog        2004-02-12 21:49:57.000000000 +0000
@@ -0,0 +1,6 @@
+2004-02-12  Scott James Remnant  <address@hidden>
+
+       * bootstrap, m4/libtool.m4: Argh, Gary went crazy after cvsapply
+       went crazy and backed out more than he should've.  This patch puts
+       some of it back again.
+
diff -ruNp libtool-gary87-CVS~/bootstrap libtool-gary87-CVS/bootstrap
--- libtool-gary87-CVS~/bootstrap       2004-02-11 02:32:04.000000000 +0000
+++ libtool-gary87-CVS/bootstrap        2004-02-12 21:41:36.000000000 +0000
@@ -67,6 +67,6 @@ for file in $fakes; do
 done
 
 # These files con cause an infinite configure loop if left behind.
-rm -f Makefile libltdl/Makefile libtool
+rm -f Makefile libltdl/Makefile libtool vcl.tmp
 
 exit 0
diff -ruNp libtool-gary87-CVS~/m4/libtool.m4 libtool-gary87-CVS/m4/libtool.m4
--- libtool-gary87-CVS~/m4/libtool.m4   2004-02-12 16:47:44.000000000 +0000
+++ libtool-gary87-CVS/m4/libtool.m4    2004-02-12 21:47:17.000000000 +0000
@@ -97,6 +97,7 @@ dnl Autoconf doesn't catch unexpanded LT
 m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
 m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW)$])dnl
 AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
 AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl

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