From: Glenn Morris <rgm@gnu.org>
Date: Wed, 7 May 2014 16:56:34 +0000 (-0400)
Subject: * autogen.sh: Check for failing aclocal.
X-Git-Tag: emacs-25.0.90~2640^2~139
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=98e12950aee65b44beb43e9dcaa77bd2b5e2d308;p=emacs.git

* autogen.sh: Check for failing aclocal.
---

diff --git a/ChangeLog b/ChangeLog
index a58fbc9ae37..7a3de25e250 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-07  Glenn Morris  <rgm@gnu.org>
+
+	* autogen.sh: Check for failing aclocal.
+
 2014-05-05  Glenn Morris  <rgm@gnu.org>
 
 	* autogen.sh: Check any pre-existing ACLOCAL_PATH.
diff --git a/autogen.sh b/autogen.sh
index 35175e70b1c..32f86ab8200 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -211,7 +211,17 @@ fi
 echo "Checking for pkg.m4..."
 AUTORECONF_ENV=
 env_space=
-ac_dir=`aclocal --print-ac-dir` && test -r "$ac_dir/pkg.m4" || {
+ac_dir=`aclocal --print-ac-dir` || {
+    cat <<EOF
+There was a problem running 'aclocal --print-ac-dir'.
+The aclocal program is part of automake.
+Please check your automake installation.
+EOF
+
+    exit 1
+}
+
+test -n "$ac_dir" && test -r "$ac_dir/pkg.m4" || {
 
   # Maybe ACLOCAL_PATH is already set-up.
   if test -n "$ACLOCAL_PATH"; then