[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-235-g32d23d1

[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=32d23d16c2486cc16df2301af6da6187f43085f3

The branch, branch-1.11 has been updated
       via  32d23d16c2486cc16df2301af6da6187f43085f3 (commit)
       via  2e5b3599df31bc4958f61cf22b9b0ad9d45b86e4 (commit)
       via  78e08c867007864ef740936c3af3fdd1238b9792 (commit)
       via  51e3b6841a474d129fc25077e42dea38ec181cd6 (commit)
       via  0498520e65fed0222d07190b6124d3de92c6044c (commit)
      from  910e40e7de84ad02ec1239206e28d8174d5d83d6 (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 32d23d16c2486cc16df2301af6da6187f43085f3
Merge: 910e40e 2e5b359
Author: Stefano Lattarini <address@hidden>
Date:   Tue Oct 5 17:30:15 2010 +0200

    Merge branch 'maint' into branch-1.11

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

Summary of changes:
 ChangeLog          |   33 ++++++++++++++++++++++++++++
 THANKS             |    1 +
 m4/python.m4       |    4 +-
 tests/Makefile.am  |    1 +
 tests/Makefile.in  |    1 +
 tests/dmalloc.test |   61 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 tests/help.test    |   21 ++++++++++-------
 tests/help2.test   |   15 +++++++-----
 tests/help3.test   |   18 +++++++++------
 tests/help4.test   |   12 ++++++---
 10 files changed, 139 insertions(+), 28 deletions(-)
 create mode 100755 tests/dmalloc.test

diff --git a/ChangeLog b/ChangeLog
index c62fd22..a38debc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2010-10-04  Stefano Lattarini  <address@hidden>
+
+       Add support for newer python versions.
+       * m4/python.m4 (AM_PATH_PYTHON): Add python2.7 and python3.2 to
+       _AM_PYTHON_INTERPRETER_LIST.  Since we are at it, break a long
+       line and fix indentation.
+       * THANKS: Updated.
+       From a report by Thomas Klausner.
+
+       Add test for `AM_WITH_DMALLOC' macro.
+       * tests/dmalloc.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+
+       Fix nits and bugs in tests `help*.test'.
+       * tests/help4.test: Fix broken sed commands used to strip `-W...'
+       flags away from "$AUTOMAKE" and "$ACLOCAL".
+       * tests/help3.test: Likewise, and fix a botched comment.
+       * tests/help.test: Likewise.  Also, use "AUTOMAKE_fails ..."
+       instead of "$AUTOMAKE ... && Exit 1", for consistency and to
+       please maintainet-check.
+       * tests/help2.test: Likewise.
+
+2010-10-03  Stefano Lattarini  <address@hidden>
+           Ralf Wildenhues  <address@hidden>
+
+       Improve tests `help*.test' (also fixes maintcheck failures).
+       * tests/help.test: To run automake, use `$AUTOMAKE' with all `-W'
+       flags stripped away rather than hard-coded `automake-$APIVERSION',
+       to better honour user-overrides.  Similarly for aclocal.
+       * tests/help2.test: Likewise.
+       * tests/help3.test: Likewise.
+       * tests/help4.test: Likewise.
+
 2010-10-03  Ralf Wildenhues  <address@hidden>
 
        Document and fix expansion of variables before rules.
diff --git a/THANKS b/THANKS
index b3ceae6..78da1de 100644
--- a/THANKS
+++ b/THANKS
@@ -335,6 +335,7 @@ Theodoros V. Kalamatianos address@hidden
 Thien-Thi Nguyen       address@hidden
 Thomas Fitzsimmons     address@hidden
 Thomas Gagne           address@hidden
+Thomas Klausner                address@hidden
 Thomas Morgan          address@hidden
 Thomas Schwinge                address@hidden
 Thomas Tanner          address@hidden
diff --git a/m4/python.m4 b/m4/python.m4
index 1dc3985..50e1538 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -37,8 +37,8 @@ AC_DEFUN([AM_PATH_PYTHON],
   dnl Find a Python interpreter.  Python versions prior to 2.0 are not
   dnl supported. (2.0 was released on October 16, 2000).
   m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
-                    [python python2 python3 python3.1 python3.0 python2.6 
python2.5 python2.4 python2.3 python2.2 dnl
-python2.1 python2.0])
+[python python2 python3 python3.2 python3.1 python3.0 python2.7 dnl
+ python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0])
 
   m4_if([$1],[],[
     dnl No version check is needed.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6c6f24f..acc7640 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -284,6 +284,7 @@ distdir.test \
 distlinks.test \
 distlinksbrk.test \
 distname.test \
+dmalloc.test \
 dollar.test \
 dollarvar.test \
 dollarvar2.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 4e8c144..1d338c3 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -551,6 +551,7 @@ distdir.test \
 distlinks.test \
 distlinksbrk.test \
 distname.test \
+dmalloc.test \
 dollar.test \
 dollarvar.test \
 dollarvar2.test \
diff --git a/tests/dmalloc.test b/tests/dmalloc.test
new file mode 100755
index 0000000..629c949
--- /dev/null
+++ b/tests/dmalloc.test
@@ -0,0 +1,61 @@
+#! /bin/sh
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Simple checks on the `AM_WITH_DMALLOC' macro.
+
+. ./defs || Exit 1
+
+set -e
+
+cat >> configure.in << 'END'
+AC_CONFIG_HEADERS([config.h])
+AM_WITH_DMALLOC
+AC_SUBST([LDFLAGS])
+AC_OUTPUT
+END
+
+cat > config.h.in <<'END'
+#undef WITH_DMALLOC
+END
+
+cat > Makefile.am <<'END'
+check-with-dmalloc:
+## The AM_WITH_DMALLOC assumes that the user is a developer, so that
+## he is expected to install and make available the `dmalloc' library
+## by his own.  So we just check that proper linker and libs flags get
+## added.
+       echo ' ' $(LDFLAGS) ' ' | grep ' -g '
+       echo ' ' $(LIBS) ' ' | grep ' -ldmalloc '
+END
+
+$ACLOCAL
+$AUTOMAKE
+$AUTOCONF
+
+./configure
+cat config.h # debug info
+grep '^ */\* *# *undef  *WITH_DMALLOC *\*/ *$' config.h
+
+./configure --without-dmalloc
+cat config.h # debug info
+grep '^ */\* *# *undef  *WITH_DMALLOC *\*/ *$' config.h
+
+./configure --with-dmalloc
+cat config.h # debug info
+grep '^# *define  *WITH_DMALLOC  *1 *$' config.h
+$MAKE check-with-dmalloc
+
+:
diff --git a/tests/help.test b/tests/help.test
index ddeb92f..dd8b3b4 100755
--- a/tests/help.test
+++ b/tests/help.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.
+# Make sure --help and --version work, even when no configure.ac nor
+# configure.in is in the current directory.
 
 . ./defs || Exit 1
 
@@ -25,19 +25,22 @@ set -e
 mkdir emptydir
 cd emptydir
 
-aclocal-$APIVERSION --version
-aclocal-$APIVERSION --help
-automake-$APIVERSION --version
-automake-$APIVERSION --help
+# Honour user overrides for $ACLOCAL and $AUTOMAKE.
+ACLOCAL=`echo " $ACLOCAL " | sed 's/ -W[^ ]*/ /g'`
+AUTOMAKE=`echo " $AUTOMAKE " | sed 's/ -W[^ ]*/ /g'`
+
+$ACLOCAL --version
+$ACLOCAL --help
+$AUTOMAKE --version
+$AUTOMAKE --help
 
 # Sanity checks: aclocal and automake cannot work without configure.ac
 # or configure.in.
-aclocal-$APIVERSION 2>stderr && { cat stderr >&2; Exit 1; }
+$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
 cat stderr >&2
 $FGREP configure.ac stderr
 $FGREP configure.in stderr
-automake-$APIVERSION 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
+AUTOMAKE_fails
 $FGREP configure.ac stderr
 $FGREP configure.in stderr
 
diff --git a/tests/help2.test b/tests/help2.test
index 014f187..5212092 100755
--- a/tests/help2.test
+++ b/tests/help2.test
@@ -24,17 +24,20 @@ set -e
 mkdir cleandir
 cd cleandir
 
+# Honour user overrides for $ACLOCAL and $AUTOMAKE.
+ACLOCAL=`echo " $ACLOCAL " | sed 's/ -W[^ ]*/ /g'`
+AUTOMAKE=`echo " $AUTOMAKE " | sed 's/ -W[^ ]*/ /g'`
+
 echo '[' > configure.in
 
-automake-$APIVERSION --version
-automake-$APIVERSION --help
+$AUTOMAKE --version
+$AUTOMAKE --help
 
-# aclocal and automake cannot work without configure.ac or configure.in
-aclocal-$APIVERSION 2>stderr && { cat stderr >&2; Exit 1; }
+# Sanity checks: aclocal and automake cannot work with broken configure.in.
+$ACLOCAL 2>stderr && { cat stderr >&2; Exit 1; }
 cat stderr >&2
 $FGREP configure.in stderr
-automake-$APIVERSION 2>stderr && { cat stderr >&2; Exit 1; }
-cat stderr >&2
+AUTOMAKE_fails
 $FGREP configure.in stderr
 
 :
diff --git a/tests/help3.test b/tests/help3.test
index 8e9e76f..72399e3 100755
--- a/tests/help3.test
+++ b/tests/help3.test
@@ -24,6 +24,10 @@ set -e
 mkdir cleandir
 cd cleandir
 
+# Honour user overrides for $ACLOCAL and $AUTOMAKE.
+ACLOCAL=`echo " $ACLOCAL " | sed 's/ -W[^ ]*/ /g'`
+AUTOMAKE=`echo " $AUTOMAKE " | sed 's/ -W[^ ]*/ /g'`
+
 cat > configure.in <<END
 AC_INIT([$me], [1.0])
 AC_CONFIG_AUX_DIR([.]) dnl prevent automake from looking into '..'
@@ -36,22 +40,22 @@ cat > Makefile.am <<END
 pkgdata_DATA =
 END
 
-aclocal-$APIVERSION --force --help --output=foo.m4
+$ACLOCAL --force --help --output=foo.m4
 test ! -r foo.m4
-aclocal-$APIVERSION --output=foo.m4 --version --force
+$ACLOCAL --output=foo.m4 --version --force
 test ! -r foo.m4
 # Sanity check.
-aclocal-$APIVERSION --output=foo.m4 --force
+$ACLOCAL --output=foo.m4 --force
 test -f foo.m4
 
-mv -f foo.m4 aclocal.m4 # automake will need aclocal.m4
+mv -f foo.m4 aclocal.m4 # autoconf will need aclocal.m4
 
-automake-$APIVERSION --add-missing --help --copy
+$AUTOMAKE --add-missing --help --copy
 test ! -r install-sh
-automake-$APIVERSION --copy --version --add-mising
+$AUTOMAKE --copy --version --add-mising
 test ! -r install-sh
 # Sanity check.
-automake-$APIVERSION --add-missing --copy
+$AUTOMAKE --add-missing --copy
 test -f install-sh
 
 :
diff --git a/tests/help4.test b/tests/help4.test
index 906e508..c5eb31e 100755
--- a/tests/help4.test
+++ b/tests/help4.test
@@ -25,25 +25,29 @@ set -e
 mkdir emptydir
 cd emptydir
 
+# Honour user overrides for $ACLOCAL and $AUTOMAKE.
+ACLOCAL=`echo " $ACLOCAL " | sed 's/ -W[^ ]*/ /g'`
+AUTOMAKE=`echo " $AUTOMAKE " | sed 's/ -W[^ ]*/ /g'`
+
 escape_dots () { sed 's/\./\\./g'; } # avoid issues with `\' in backquotes
 apiversion_rx=`echo "$APIVERSION" | escape_dots`
 
-aclocal-$APIVERSION --version --help >stdout || { cat stdout; Exit 1; }
+$ACLOCAL --version --help >stdout || { cat stdout; Exit 1; }
 cat stdout
 grep "^aclocal.*$apiversion_rx" stdout
 grep "^Usage" stdout && Exit 1
 
-aclocal-$APIVERSION --help --version >stdout || { cat stdout; Exit 1; }
+$ACLOCAL --help --version >stdout || { cat stdout; Exit 1; }
 cat stdout
 grep "^Usage" stdout
 grep "^aclocal.*$apiversion_rx" stdout && Exit 1
 
-automake-$APIVERSION --version --help >stdout || { cat stdout; Exit 1; }
+$AUTOMAKE --version --help >stdout || { cat stdout; Exit 1; }
 cat stdout
 grep "^automake.*$apiversion_rx" stdout
 grep "^Usage" stdout && Exit 1
 
-automake-$APIVERSION --help --version >stdout || { cat stdout; Exit 1; }
+$AUTOMAKE --help --version >stdout || { cat stdout; Exit 1; }
 cat stdout
 grep "^Usage" stdout
 grep "^automake.*$apiversion_rx" stdout && Exit 1


hooks/post-receive
-- 
GNU Automake