From: Bruno Haible <bruno@clisp.org>
Date: Sun, 20 Jun 2021 14:06:04 +0000 (+0200)
Subject: build: Revert unneeded change.
X-Git-Tag: v0.22~241
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7787434467feebfaa53bb2e0c38b2431f6fd8a00;p=thirdparty%2Fgettext.git

build: Revert unneeded change.

* autogen.sh: Do the automake invocations bottom-up, as before.
---

diff --git a/autogen.sh b/autogen.sh
index 4c8ce9506..0eccb1a08 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -430,11 +430,6 @@ fi
 # The aclocal and autoconf invocations need to be done bottom-up
 # (subdirs first), so that 'configure --help' shows also the options
 # that matter for the subdirs.
-# The automake invocations need to be done top-down (subdirs last), however,
-# because otherwise the invocation of automake in gettext-runtime/ overwrites
-# gettext-runtime/intl/Makefile.in with one that lists the wrong *.m4 files
-# and thus produces an endless recursion when invoked through 'make'. Seen
-# with automake 1.16.3.
 dir0=`pwd`
 
 echo "$0: generating configure in gettext-runtime/intl..."
@@ -443,6 +438,7 @@ aclocal -I ../../m4 -I ../m4 -I gnulib-m4 \
   && autoconf \
   && autoheader && touch config.h.in \
   && touch ChangeLog \
+  && automake --add-missing --copy \
   && rm -rf autom4te.cache \
   || exit $?
 cd "$dir0"
@@ -453,6 +449,7 @@ aclocal -I ../../m4 -I ../m4 -I gnulib-m4 \
   && autoconf \
   && autoheader && touch config.h.in \
   && touch ChangeLog \
+  && automake --add-missing --copy \
   && rm -rf autom4te.cache \
   || exit $?
 cd "$dir0"
@@ -463,6 +460,7 @@ aclocal -I m4 -I ../m4 -I gnulib-m4 \
   && autoconf \
   && autoheader && touch config.h.in \
   && touch ChangeLog \
+  && automake --add-missing --copy \
   && rm -rf autom4te.cache \
   || exit $?
 cd "$dir0"
@@ -479,6 +477,7 @@ cd gettext-tools/examples
 aclocal -I ../../gettext-runtime/m4 -I ../../m4 \
   && autoconf \
   && touch ChangeLog \
+  && automake --add-missing --copy \
   && rm -rf autom4te.cache \
   || exit $?
 cd "$dir0"
@@ -513,6 +512,7 @@ aclocal -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m
   && autoconf \
   && autoheader && touch config.h.in \
   && touch ChangeLog \
+  && automake --add-missing --copy \
   && rm -rf autom4te.cache \
   || exit $?
 cd "$dir0"
@@ -531,39 +531,4 @@ aclocal -I m4 \
             gettext-tools/examples/autom4te.cache \
   || exit $?
 
-echo "$0: generating Makefile.in in gettext-tools..."
-cd gettext-tools
-automake --add-missing --copy \
-  && rm -rf autom4te.cache \
-  || exit $?
-cd "$dir0"
-
-echo "$0: generating Makefile.in in gettext-tools/examples..."
-cd gettext-tools/examples
-automake --add-missing --copy \
-  && rm -rf autom4te.cache \
-  || exit $?
-cd "$dir0"
-
-echo "$0: generating Makefile.in in gettext-runtime..."
-cd gettext-runtime
-automake --add-missing --copy \
-  && rm -rf autom4te.cache \
-  || exit $?
-cd "$dir0"
-
-echo "$0: generating Makefile.in in gettext-runtime/libasprintf..."
-cd gettext-runtime/libasprintf
-automake --add-missing --copy \
-  && rm -rf autom4te.cache \
-  || exit $?
-cd "$dir0"
-
-echo "$0: generating Makefile.in in gettext-runtime/intl..."
-cd gettext-runtime/intl
-automake --add-missing --copy \
-  && rm -rf autom4te.cache \
-  || exit $?
-cd "$dir0"
-
 echo "$0: done.  Now you can run './configure'."