From 0bcd03be6c48cdc7e0af7450ec2d8f93a061df96 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Sat, 24 Aug 2002 12:46:03 +0000 Subject: [PATCH] For Debian Bug#157778: * m4/python.m4: Fix output of `python' in checking messages when no version of Python is required. --- ChangeLog | 6 ++++++ m4/python.m4 | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ecd5ee6..d0d4196 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2002-08-24 Alexandre Duret-Lutz + + 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 * lib/am/depend2.am (%EXT%.lo): Fix typo. Rename the file that diff --git a/m4/python.m4 b/m4/python.m4 index f543a43..6014902 100644 --- 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]) -- 2.7.4