[Automake-commit] [SCM] GNU Automake branch, maint, updated. v1.11-312-g5bf7af6

[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=5bf7af6e1e5fa63bc192ed972ef8c83dd6faec2b

The branch, maint has been updated
       via  5bf7af6e1e5fa63bc192ed972ef8c83dd6faec2b (commit)
      from  5cc6a5a3835fe98b23e4dae86ba7228f977e50a2 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                   |   10 ++++++++++
 THANKS                                      |    2 +-
 doc/automake.texi                           |   10 +++++++---
 m4/python.m4                                |    2 ++
 tests/Makefile.am                           |    1 +
 tests/Makefile.in                           |    1 +
 tests/{help-regex.test => help-python.test} |   11 +++++------
 7 files changed, 27 insertions(+), 10 deletions(-)
 copy tests/{help-regex.test => help-python.test} (77%)

diff --git a/ChangeLog b/ChangeLog
index 786cadd..fa53707 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-02-15  Stefano Lattarini  <address@hidden>
+
+       python: report the 'PYTHON' influential environment variable
+       * m4/python.m4 (AM_PATH_PYTHON): Call AC_ARG_VAR on PYTHON.
+       * doc/automake.texi (Python): Update and extend.
+       * tests/help-python.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+       * THANKS (Jack Kelly): Update e-mail address.
+       Suggestion by Jack Kelly.
+
 2011-02-10  Stefano Lattarini  <address@hidden>
 
        tests defs: clear TESTS_ENVIRONMENT variable
diff --git a/THANKS b/THANKS
index 78da1de..60af1ee 100644
--- a/THANKS
+++ b/THANKS
@@ -134,7 +134,7 @@ Ian Lance Taylor    address@hidden
 Илья Н. Голубев            address@hidden
 Imacat                 address@hidden
 Inoue                  address@hidden
-Jack Kelly             address@hidden
+Jack Kelly             address@hidden
 James Amundson         address@hidden
 James Henstridge       address@hidden
 James R. Van Zandt     address@hidden
diff --git a/doc/automake.texi b/doc/automake.texi
index f5066d4..b6fc4ab 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -7603,7 +7603,8 @@ files in your @file{Makefile.am}, depending on where you 
want your files
 installed (see the definitions of @code{pythondir} and
 @code{pkgpythondir} below).
 
address@hidden AM_PATH_PYTHON (@ovar{version}, @ovar{action-if-found}, 
@ovar{action-if-not-found})
address@hidden AM_PATH_PYTHON (@ovar{version}, @ovar{action-if-found}, @
+  @ovar{action-if-not-found})
 
 Search for a Python interpreter on the system.  This macro takes three
 optional arguments.  The first argument, if present, is the minimum
@@ -7629,6 +7630,9 @@ If Python >= 2.5 was only @emph{optional} to the package,
 AM_PATH_PYTHON([2.5],, [:])
 @end example
 
+If the @env{PYTHON} variable is set when @code{AM_PATH_PYTHON} is
+called, then that will be the only Python interpreter that is tried.
+
 @code{AM_PATH_PYTHON} creates the following output variables based on
 the Python installation found during configuration.
 @end defmac
@@ -7644,8 +7648,8 @@ to setup a conditional in order to disable the relevant 
part of a build
 as follows.
 
 @example
-  AM_PATH_PYTHON(,, [:])
-  AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
+AM_PATH_PYTHON(,, [:])
+AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
 @end example
 
 @item PYTHON_VERSION
diff --git a/m4/python.m4 b/m4/python.m4
index 50e1538..655dcf3 100644
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -40,6 +40,8 @@ AC_DEFUN([AM_PATH_PYTHON],
 [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])
 
+  AC_ARG_VAR([PYTHON], [the Python interpreter])
+
   m4_if([$1],[],[
     dnl No version check is needed.
     # Find any Python interpreter.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c9f8467..ed415f2 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -374,6 +374,7 @@ help-init.test \
 help-lispdir.test \
 help-maintainer.test \
 help-multilib.test \
+help-python.test \
 help-regex.test \
 help-silent.test \
 help-upc.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 1370461..1363930 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -644,6 +644,7 @@ help-init.test \
 help-lispdir.test \
 help-maintainer.test \
 help-multilib.test \
+help-python.test \
 help-regex.test \
 help-silent.test \
 help-upc.test \
diff --git a/tests/help-regex.test b/tests/help-python.test
similarity index 77%
copy from tests/help-regex.test
copy to tests/help-python.test
index 3eff5f9..ba20013 100755
--- a/tests/help-regex.test
+++ b/tests/help-python.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2010 Free Software Foundation, Inc.
+# Copyright (C) 2011 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
@@ -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 that obsolescent macro `AM_WITH_REGEX' adds proper text to
-# the configure help screen.
+# Make sure that macro `AM_PATH_PYTHON' adds proper text to the
+# configure help screen.
 
 . ./defs || Exit 1
 
@@ -23,7 +23,7 @@ set -e
 
 cat > configure.in <<END
 AC_INIT([$me], [1.0])
-AM_WITH_REGEX
+AM_PATH_PYTHON
 END
 
 $ACLOCAL
@@ -32,7 +32,6 @@ $AUTOCONF
 ./configure --help >stdout || { cat stdout; Exit 1; }
 cat stdout
 
-$FGREP ' --without-regex ' stdout
-$FGREP ' use GNU rx ' stdout
+grep '^  *PYTHON  *the Python interpreter$' stdout
 
 :


hooks/post-receive
-- 
GNU Automake