From: Gary V. Vaughan <gary@gnu.org>
Date: Wed, 16 Mar 2005 00:16:37 +0000 (+0000)
Subject: * bootstrap: Revert the other part of the accidental commit.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a9668fbc50ec8f429d3d940046f67d9a88063af;p=thirdparty%2Flibtool.git

* bootstrap: Revert the other part of the accidental commit.
---

diff --git a/ChangeLog b/ChangeLog
index deefe37f6..6473ee5ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-16  Gary V. Vaughan  <gary@gnu.org>
+
+	* bootstrap: Revert the other part of the accidental commit.
+
 2005-03-15  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* libltdl/configure.ac: Update version; require Autoconf >= 2.59.
diff --git a/bootstrap b/bootstrap
index f769cc198..3f7c24a92 100755
--- a/bootstrap
+++ b/bootstrap
@@ -62,14 +62,6 @@ test -f Makefile || { makefile=Makefile; cp Makefile.am $makefile; }
 make ./config/ltmain.sh ./m4/ltversion.m4 ./libtoolize.in ./tests/defs.in \
     top_srcdir=. PACKAGE="$2" VERSION="$3" M4SH="autom4te -l m4sh"
 
-# Create libltdl auxdirs:
-auxdirs="m4 config"
-for dir in $auxdirs; do
-  rm -rf ./libltdl/$dir
-  mkdir ./libltdl/$dir
-done
-cp ./config/ltmain.sh libltdl/config/
-
 test -f clcommit.m4sh && make -f Makefile.maint commit \
     top_srcdir=. PACKAGE="$2" VERSION="$3" M4SH="autom4te -l m4sh" \
     SED=sed GREP=grep FGREP=fgrep EGREP=egrep LN_S="ln -s"
@@ -94,8 +86,8 @@ for sub in $reconfdirs; do
   autoreconf --force --verbose --install $sub
 done
 
-# Remove our dummy libtoolize and copied dummy ltmain.sh
-rm -f ./config/libtoolize ./libltdl/config/ltmain.sh
+# Remove our dummy libtoolize
+rm -f ./config/libtoolize
 
 # These files can cause an infinite configure loop if left behind.
 rm -f Makefile libltdl/Makefile libtool vcl.tmp