For Debian Bug#157778:

* m4/python.m4: Fix output of `python' in checking messages
when no version of Python is required.

diff --git a/ChangeLog b/ChangeLog
index ecd5ee670e77de48d5826fb1c18f7a87b3770da7..d0d419680ac4c9013e532f599cfab54a41146db9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-24  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       For Debian Bug#157778:
+       * m4/python.m4: Fix output of `python' in checking messages
+       when no version of Python is required.
+
 2002-08-23  Raja R Harinath  <harinath@cs.umn.edu>
 
        * lib/am/depend2.am (%EXT%.lo): Fix typo.  Rename the file that

diff --git a/m4/python.m4 b/m4/python.m4
index f543a4339d5f41bdf4ec4511294c81c8bf3a1bfd..6014902e4cbfbcac1d5865ed675d4f724b6d17c7 100644 (file)
--- a/m4/python.m4
+++ b/m4/python.m4
@@ -56,7 +56,9 @@ AC_DEFUN([AM_PATH_PYTHON],
   m4_if([$1],[],[
     dnl No version check is needed.
     # Find any Python interpreter.
-    AC_PATH_PROG([PYTHON], _AM_PYTHON_INTERPRETER_LIST)],[
+    AC_PATH_PROG([PYTHON], _AM_PYTHON_INTERPRETER_LIST)
+    am_display_PYTHON=python
+  ], [
     dnl A version check is needed.
     if test -n "$PYTHON"; then
       # If the user set $PYTHON, use it and don't search something else.
@@ -77,6 +79,7 @@ AC_DEFUN([AM_PATH_PYTHON],
         done])
       # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
       AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
+      am_display_PYTHON=$am_cv_pathless_PYTHON
     fi
   ])
 
@@ -84,7 +87,7 @@ AC_DEFUN([AM_PATH_PYTHON],
   dnl the best way to do this; it's what "site.py" does in the standard
   dnl library.
 
-  AC_CACHE_CHECK([for $am_cv_pathless_PYTHON version], [am_cv_python_version],
+  AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
     [am_cv_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`])
   AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
 
@@ -99,8 +102,7 @@ AC_DEFUN([AM_PATH_PYTHON],
   dnl At times (like when building shared libraries) you may want
   dnl to know which OS platform Python thinks this is.
 
-  AC_CACHE_CHECK([for $am_cv_pathless_PYTHON platform],
-                [am_cv_python_platform],
+  AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform],
     [am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`])
   AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform])