Simplify use of gnulib-tool now that gnulib-tool --import works better.

2 files changed, 5 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 62861db..8bedf04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-04  Bruno Haible  <bruno@clisp.org>
+
+	Simplify use of gnulib-tool now that gnulib-tool --import works better.
+	* autogen.sh: Don't remove gnulib-cache.m4 before running gnulib-tool.
+
 2010-06-04  Bruno Haible  <bruno@clisp.org>
 
 	* m4/libtool.m4: Update from libtool-2.2.8, with modifications.
diff --git a/autogen.sh b/autogen.sh
index fa9bc70..bcc3451 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -71,12 +71,6 @@ if test $skip_gnulib = false; then
   fi
   # Skip the gnulib-tool step if gnulib-tool was not found.
   if test -n "$GNULIB_TOOL"; then
-    if test -f m4/gnulib-cache.m4; then
-      mv -f m4/gnulib-cache.m4 m4/gnulib-cache.m4~
-    fi
-    if test -f lib/Makefile.gnulib; then
-      mv -f lib/Makefile.gnulib lib/Makefile.gnulib~
-    fi
     GNULIB_MODULES='
       unitypes
       unistr/base