Reorder commands so that they succeed.

diff --git a/ChangeLog b/ChangeLog
index 3a56eb5bc91f6be9ff3bdbd3c37e8e1dcf2da4cd..9de4b797b774b5e14af25a599b9cd002e10d0911 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-30  Bruno Haible  <bruno@clisp.org>
+
+       * autogen.sh: Treat gettext-runtime/libasprintf before gettext-runtime.
+       Treat gettext-tools/examples before gettext-tools.
+
 2009-10-18  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (distcheck-hook): Compare fcntl_h.m4.

diff --git a/autogen.sh b/autogen.sh
index 3e3e1503e9c0d5301bd2daf71e95aa98a2805d17..0581cd210ecbd674084bc1d8cd1fc1f1748e6a45 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -311,6 +311,13 @@ fi
  fi
 )
 
+(cd gettext-runtime/libasprintf
+ ../../build-aux/fixaclocal aclocal -I ../../m4 -I ../m4 -I gnulib-m4
+ autoconf
+ autoheader && touch config.h.in
+ automake --add-missing --copy
+)
+
 (cd gettext-runtime
  ../build-aux/fixaclocal aclocal -I m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4
  autoconf
@@ -326,15 +333,18 @@ fi
  fi
 )
 
-(cd gettext-runtime/libasprintf
- ../../build-aux/fixaclocal aclocal -I ../../m4 -I ../m4 -I gnulib-m4
+cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS
+
+(cd gettext-tools/examples
+ ../../build-aux/fixaclocal aclocal -I ../../gettext-runtime/m4 -I ../../m4
  autoconf
- autoheader && touch config.h.in
  automake --add-missing --copy
+ # Rebuilding the examples PO files is only rarely needed.
+ if ! $quick; then
+   ./configure && (cd po && make update-po) && make distclean
+ fi
 )
 
-cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS
-
 (cd gettext-tools
  ../build-aux/fixaclocal aclocal -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4
  autoconf
@@ -353,16 +363,6 @@ cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS
  fi
 )
 
-(cd gettext-tools/examples
- ../../build-aux/fixaclocal aclocal -I ../../gettext-runtime/m4 -I ../../m4
- autoconf
- automake --add-missing --copy
- # Rebuilding the examples PO files is only rarely needed.
- if ! $quick; then
-   ./configure && (cd po && make update-po) && make distclean
- fi
-)
-
 build-aux/fixaclocal aclocal -I m4
 autoconf
 automake