emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r117069: * autogen.sh: Check for failing aclocal.


From: Glenn Morris
Subject: [Emacs-diffs] trunk r117069: * autogen.sh: Check for failing aclocal.
Date: Wed, 07 May 2014 16:56:38 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 117069
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2014-05-07 12:56:34 -0400
message:
  * autogen.sh: Check for failing aclocal.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  autogen.sh                     autogen.sh-20091113204419-o5vbwnq5f7feedwu-2495
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-05-05 17:22:32 +0000
+++ b/ChangeLog 2014-05-07 16:56:34 +0000
@@ -1,3 +1,7 @@
+2014-05-07  Glenn Morris  <address@hidden>
+
+       * autogen.sh: Check for failing aclocal.
+
 2014-05-05  Glenn Morris  <address@hidden>
 
        * autogen.sh: Check any pre-existing ACLOCAL_PATH.

=== modified file 'autogen.sh'
--- a/autogen.sh        2014-05-05 17:22:32 +0000
+++ b/autogen.sh        2014-05-07 16:56:34 +0000
@@ -211,7 +211,17 @@
 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


reply via email to

[Prev in Thread] Current Thread [Next in Thread]