HCoop
/
bpt
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f62bc93
)
* autogen.sh: Check for failing aclocal.
author
Glenn Morris
<rgm@gnu.org>
Wed, 7 May 2014 16:56:34 +0000
(12:56 -0400)
committer
Glenn Morris
<rgm@gnu.org>
Wed, 7 May 2014 16:56:34 +0000
(12:56 -0400)
ChangeLog
patch
|
blob
|
blame
|
history
autogen.sh
patch
|
blob
|
blame
|
history
diff --git
a/ChangeLog
b/ChangeLog
index
a58fbc9
..
7a3de25
100644
(file)
--- 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.
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
35175e7
..
32f86ab
100755
(executable)
--- a/
autogen.sh
+++ b/
autogen.sh
@@
-211,7
+211,17
@@
fi
echo "Checking for pkg.m4..."
AUTORECONF_ENV=
env_space=
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
# Maybe ACLOCAL_PATH is already set-up.
if test -n "$ACLOCAL_PATH"; then