Avoid the need to run autogen.sh twice.

diff --git a/ChangeLog b/ChangeLog
index 0fc4676941b99d9a280c303dbfe0db81298d4dfe..c893c17630c0ea3bf1d8279ced6e72c25f628432 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-31  Bruno Haible  <bruno@clisp.org>
+
+       * autogen.sh: Process the top-level directory after its subdirectories,
+       not before. Needed because of the recursive autoconf invocation in
+       the top-level configure.ac.
+
 2006-07-31  Bruno Haible  <bruno@clisp.org>
 
        * autogen.sh: If GNULIB_TOOL is not set, make an anonymous checkout

diff --git a/autogen.sh b/autogen.sh
index d17d4dd51e5a936021bb18ee8a0e12ca73cbe81b..f48d0deab0e3de8921efc9c643901b794bc2b1ad 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -141,10 +141,6 @@ if test -n "$GNULIB_TOOL"; then
     --import $GNULIB_MODULES_FOR_SRC $GNULIB_MODULES_OTHER
 fi
 
-aclocal
-autoconf
-automake
-
 (cd autoconf-lib-link
  aclocal -I m4 -I ../m4
  autoconf
@@ -184,4 +180,8 @@ cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS
  fi
 )
 
+aclocal
+autoconf
+automake
+
 cp -p autoconf-lib-link/config.rpath build-aux/config.rpath