* m4/python.m4 (AM_PATH_PYTHON): Make sure am_display_PYTHON is

set when $PYTHON has been set by the user.
From Esben Haabendal Soerensen.

diff --git a/ChangeLog b/ChangeLog
index 38081dbae70de56e80bfa30ef756b1a6912f7b7c..fd44f272f4362c246b7ad2e33ebdaeb5cd277fac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-26  Alexandre Duret-Lutz  <adl@gnu.org>
+
+       * m4/python.m4 (AM_PATH_PYTHON): Make sure am_display_PYTHON is
+       set when $PYTHON has been set by the user.
+       From Esben Haabendal Soerensen.
+
 2004-03-22  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * doc/automake.texi (Default _SOURCES): Typo.

diff --git a/THANKS b/THANKS
index 7e10ef8d0a3dd04dcc71dd632388200a56f4364b..09cc4d52c8755b8e3cfc6dd2872f9d1531af1e88 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -65,6 +65,7 @@ Eric Siegerman                erics_97@pobox.com
 Eric Sunshine          sunshine@sunshineco.com
 Erick Branderhorst     branderh@iaehv.nl
 Erik Lindahl           E.Lindahl@chem.rug.nl
+Esben Haabendal Soerensen bart@kom.aau.dk
 Ezra Peisach           epeisach@MED-XTAL.BU.EDU
 Flavien Astraud                flav42@yahoo.fr
 François Pinard                pinard@iro.umontreal.ca

diff --git a/m4/python.m4 b/m4/python.m4
index fb4b710c833d796c71a5dccc32283ad68ae7d651..9d66d887675269fd913e5c711291a61e054ad21a 100644 (file)
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -71,6 +71,7 @@ python2.1 python2.0 python1.6 python1.5])
       AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
                              [AC_MSG_RESULT(yes)],
                              [AC_MSG_ERROR(too old)])
+      am_display_PYTHON=$PYTHON
     else
       # Otherwise, try each interpreter until we find one that satisfies
       # VERSION.