From: Bruno Haible <bruno@clisp.org>
Date: Mon, 12 Dec 2016 02:08:49 +0000 (+0100)
Subject: Fix error handling in autogen.sh.
X-Git-Tag: v0.20~481
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94737a1be1a1d68f7e032ceac9cc2ed770f36196;p=thirdparty%2Fgettext.git

Fix error handling in autogen.sh.

* autogen.sh: Don't invoke automake if aclocal, autoconf, or autoheader failed.
---

diff --git a/autogen.sh b/autogen.sh
index b42d76d02..b605b6492 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -101,7 +101,7 @@ if ! $skip_gnulib; then
     if $use_git && test -d "$GNULIB_SRCDIR"/.git && \
           git_modules_config submodule.gnulib.url >/dev/null; then
       echo "$0: getting gnulib files..."
-      if git submodule -h|grep -- --reference > /dev/null; then
+      if git submodule -h | grep -- --reference > /dev/null; then
         # Prefer the one-liner available in git 1.6.4 or newer.
         git submodule update --init --reference "$GNULIB_SRCDIR" \
           "$gnulib_path" || exit $?
@@ -496,7 +496,7 @@ cd gettext-tools
 aclocal -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 \
   && autoconf \
   && autoheader && touch ChangeLog config.h.in \
-  && test -d intl || mkdir intl \
+  && { test -d intl || mkdir intl; } \
   && automake --add-missing --copy \
   || exit $?
 cd "$dir0"