[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-241-g15cd54c

[Stefano Lattarini]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=15cd54c001e1510c6593adfd3391f69d4bcc9c45

The branch, maint has been updated
       via  15cd54c001e1510c6593adfd3391f69d4bcc9c45 (commit)
       via  b27b2126762e3a39c04548dc21ed30d4cc2c3de7 (commit)
       via  3262c47dcfebd2dbfe79f8c885ff81fda6c0a86b (commit)
      from  36c1b5c0f0d5e9a9a3c91233fcb0e408ef6093e3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 15cd54c001e1510c6593adfd3391f69d4bcc9c45
Author: Stefano Lattarini <address@hidden>
Date:   Fri Nov 19 20:24:28 2010 +0100

    Automake::Config: remove extra trailing semicolon.
    
    * lib/Automake/Config.in: Remove extra trailing semicolon.

commit b27b2126762e3a39c04548dc21ed30d4cc2c3de7
Author: Stefano Lattarini <address@hidden>
Date:   Fri Nov 19 19:52:48 2010 +0100

    help4.test: fix botched heading comment.
    
    * tests/help4.test: Fixed the heading comment, since it
    didn't correctly describe what checks the testcase was
    supposed to perform.

commit 3262c47dcfebd2dbfe79f8c885ff81fda6c0a86b
Author: Stefano Lattarini <address@hidden>
Date:   Fri Nov 19 19:43:28 2010 +0100

    help2.test: add checks on aclocal too.
    
    * tests/help2.test: Check that also `aclocal --version' and
    `aclocal --help' work with configure.in and acinclude.m4 both
    broken.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog              |   15 +++++++++++++++
 lib/Automake/Config.in |    2 +-
 tests/help2.test       |   12 +++++++++++-
 tests/help4.test       |    4 ++--
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e3618a7..fbc114e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-11-19  Stefano Lattarini  <address@hidden>
+
+       Automake::Config: remove extra trailing semicolon.
+       * lib/Automake/Config.in: Remove extra trailing semicolon.
+
+       help4.test: fix botched heading comment.
+       * tests/help4.test: Fixed the heading comment, since it
+       didn't correctly describe what checks the testcase was
+       supposed to perform.
+
+       help2.test: add checks on aclocal too.
+       * tests/help2.test: Check that also `aclocal --version' and
+       `aclocal --help' work with configure.in and acinclude.m4 both
+       broken.
+
 2010-11-17  Stefano Lattarini  <address@hidden>
 
        Fix spurious failures of silent-rules tests with Sun Fortran.
diff --git a/lib/Automake/Config.in b/lib/Automake/Config.in
index 7e87044..b6674dc 100644
--- a/lib/Automake/Config.in
+++ b/lib/Automake/Config.in
@@ -34,7 +34,7 @@ our $VERSION = '@VERSION@';
 our $libdir = '@datadir@/@address@hidden@APIVERSION@';
 our $perl_threads = @PERL_THREADS@;
 
-1;;
+1;
 
 ### Setup "GNU" style for perl-mode and cperl-mode.
 ## Local Variables:
diff --git a/tests/help2.test b/tests/help2.test
index 5212092..b74f30a 100755
--- a/tests/help2.test
+++ b/tests/help2.test
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Make sure --help and --version work, even when the current directory
-# contains a broken configure.in.
+# contains a broken configure.in and a broken acinclude.m4.
 . ./defs || Exit 1
 
 set -e
@@ -29,9 +29,19 @@ ACLOCAL=`echo " $ACLOCAL " | sed 's/ -W[^ ]*/ /g'`
 AUTOMAKE=`echo " $AUTOMAKE " | sed 's/ -W[^ ]*/ /g'`
 
 echo '[' > configure.in
+echo '[' > acinclude.m4
 
 $AUTOMAKE --version
 $AUTOMAKE --help
+$ACLOCAL --version
+$ACLOCAL --help
+
+# Sanity check: aclocal cannot work with broken acinclude.m4.
+$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
+cat stderr >&2
+$FGREP acinclude.m4 stderr
+
+rm -f acinclude.m4
 
 # Sanity checks: aclocal and automake cannot work with broken configure.in.
 $ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
diff --git a/tests/help4.test b/tests/help4.test
index c5eb31e..1b7de41 100755
--- a/tests/help4.test
+++ b/tests/help4.test
@@ -14,8 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make sure --help and --version work, even when no configure.ac
-# is in the current directory.
+# Check that the first among --help and --version to be specified on
+# the command line takes precedence over the following one.
 
 . ./defs || Exit 1
 


hooks/post-receive
-- 
GNU Automake