Merge from emacs-24; up to 2014-05-15T16:55:18Z!jan.h.d@swipnet.se

[bpt/emacs.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 35175e7..32f86ab 100755 (executable)
--- 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