Make removal of gnulib modules smoother.

diff --git a/ChangeLog b/ChangeLog
index bf6f3640efa6560135d1ac2b4555a8cab762149d..9c72513dab9829e4aa9474053765a8c76f67de1f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-04  Bruno Haible  <bruno@clisp.org>
+
+       * autogen.sh: Remove gnulib-cache.m4 files before running gnulib-tool,
+       so that removed modules are really dropped.
+
 2007-02-28  Bruno Haible  <bruno@clisp.org>
 
        Move relocatability infrastructure to gnulib.

diff --git a/autogen.sh b/autogen.sh
index f34b5f89b58aed34fde0594c6445568e6349db02..f9cadea01d8fcf3bbbcb078b628cb9965f05a2e6 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -8,7 +8,7 @@
 #     in a gnulib checkout, or
 #   - the cvs program in the PATH and an internet connection.
 
-# Copyright (C) 2003-2006 Free Software Foundation, Inc.
+# Copyright (C) 2003-2007 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -51,6 +51,7 @@ fi
 # Skip the gnulib-tool step if gnulib-tool was not found.
 if test -n "$GNULIB_TOOL"; then
   # In gettext-runtime:
+  mv -f gettext-runtime/gnulib-m4/gnulib-cache.m4 gettext-runtime/gnulib-m4/gnulib-cache.m4~
   GNULIB_MODULES_RUNTIME_FOR_SRC='
   atexit
   basename
@@ -78,6 +79,7 @@ if test -n "$GNULIB_TOOL"; then
   $GNULIB_TOOL --dir=gettext-runtime --lib=libgrt --source-base=gnulib-lib --m4-base=gnulib-m4 --no-libtool --local-dir=gnulib-local --local-symlink \
     --import $GNULIB_MODULES_RUNTIME_FOR_SRC $GNULIB_MODULES_RUNTIME_OTHER
   # In gettext-tools:
+  mv -f gettext-tools/gnulib-m4/gnulib-cache.m4 gettext-tools/gnulib-m4/gnulib-cache.m4~
   GNULIB_MODULES_TOOLS_FOR_SRC='
   alloca-opt
   atexit
@@ -175,6 +177,7 @@ if test -n "$GNULIB_TOOL"; then
   $GNULIB_TOOL --dir=gettext-tools --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --makefile-name=Makefile.gnulib --libtool --local-dir=gnulib-local --local-symlink \
     --import $GNULIB_MODULES_TOOLS_FOR_SRC $GNULIB_MODULES_TOOLS_OTHER
   # In gettext-tools/libgettextpo:
+  mv -f gettext-tools/libgettextpo/gnulib-m4/gnulib-cache.m4 gettext-tools/libgettextpo/gnulib-m4/gnulib-cache.m4~
   # This is a subset of the GNULIB_MODULES_FOR_SRC.
   GNULIB_MODULES_LIBGETTEXTPO='
   basename