2004-11-05  Stepan Kasal  <address@hidden>

	* m4/python.m4 (AM_PATH_PYTHON): Don't set the variable before
	  calling AC_PATH_PROGS.  Don't use test -n "$PYTHON", the user
	  might have set the variable to something starting with a dash.
	  Instead of PYTHON=:, simply leave the variable empty; check for
	  empty string where appropriate.  Fix indentation of the final
	  big ``else'' branch.

Index: m4/python.m4
===================================================================
RCS file: /cvsroot/automake/automake/m4/python.m4,v
retrieving revision 1.17
diff -d -u -r1.17 python.m4
--- m4/python.m4	26 Mar 2004 21:00:47 -0000	1.17
+++ m4/python.m4	5 Nov 2004 09:12:46 -0000
@@ -58,14 +58,11 @@
   m4_if([$1],[],[
     dnl No version check is needed.
     # Find any Python interpreter.
-    if test -z "$PYTHON"; then
-      PYTHON=:
-      AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST)
-    fi
+    AC_PATH_PROGS([PYTHON], _AM_PYTHON_INTERPRETER_LIST)
     am_display_PYTHON=python
   ], [
     dnl A version check is needed.
-    if test -n "$PYTHON"; then
+    if test "x$PYTHON" != x; then
       # If the user set $PYTHON, use it and don't search something else.
       AC_MSG_CHECKING([whether $PYTHON version >= $1])
       AM_PYTHON_CHECK_VERSION([$PYTHON], [$1],
@@ -82,82 +79,80 @@
 	  AM_PYTHON_CHECK_VERSION([$am_cv_pathless_PYTHON], [$1], [break])
 	done])
       # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
-      if test "$am_cv_pathless_PYTHON" = none; then
-	PYTHON=:
-      else
+      if test "x$am_cv_pathless_PYTHON" != xnone; then
         AC_PATH_PROG([PYTHON], [$am_cv_pathless_PYTHON])
       fi
       am_display_PYTHON=$am_cv_pathless_PYTHON
     fi
   ])
 
-  if test "$PYTHON" = :; then
-  dnl Run any user-specified action, or abort.
+  if test "x$PYTHON" = x; then
+    dnl Run any user-specified action, or abort.
     m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
   else
 
-  dnl Query Python for its version number.  Getting [:3] seems to be
-  dnl the best way to do this; it's what "site.py" does in the standard
-  dnl library.
+    dnl Query Python for its version number.  Getting [:3] seems to be
+    dnl the best way to do this; it's what "site.py" does in the standard
+    dnl library.
 
-  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])
+    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])
 
-  dnl Use the values of $prefix and $exec_prefix for the corresponding
-  dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX.  These are made
-  dnl distinct variables so they can be overridden if need be.  However,
-  dnl general consensus is that you shouldn't need this ability.
+    dnl Use the values of $prefix and $exec_prefix for the corresponding
+    dnl values of PYTHON_PREFIX and PYTHON_EXEC_PREFIX.  These are made
+    dnl distinct variables so they can be overridden if need be.  However,
+    dnl general consensus is that you shouldn't need this ability.
 
-  AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
-  AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
+    AC_SUBST([PYTHON_PREFIX], ['${prefix}'])
+    AC_SUBST([PYTHON_EXEC_PREFIX], ['${exec_prefix}'])
 
-  dnl At times (like when building shared libraries) you may want
-  dnl to know which OS platform Python thinks this is.
+    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_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])
+    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])
 
 
-  dnl Set up 4 directories:
+    dnl Set up 4 directories:
 
-  dnl pythondir -- where to install python scripts.  This is the
-  dnl   site-packages directory, not the python standard library
-  dnl   directory like in previous automake betas.  This behavior
-  dnl   is more consistent with lispdir.m4 for example.
-  dnl Query distutils for this directory.  distutils does not exist in
-  dnl Python 1.5, so we fall back to the hardcoded directory if it
-  dnl doesn't work.
-  AC_CACHE_CHECK([for $am_display_PYTHON script directory],
-    [am_cv_python_pythondir],
-    [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
-     echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
-  AC_SUBST([pythondir], [$am_cv_python_pythondir])
+    dnl pythondir -- where to install python scripts.  This is the
+    dnl   site-packages directory, not the python standard library
+    dnl   directory like in previous automake betas.  This behavior
+    dnl   is more consistent with lispdir.m4 for example.
+    dnl Query distutils for this directory.  distutils does not exist in
+    dnl Python 1.5, so we fall back to the hardcoded directory if it
+    dnl doesn't work.
+    AC_CACHE_CHECK([for $am_display_PYTHON script directory],
+      [am_cv_python_pythondir],
+      [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null ||
+       echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`])
+    AC_SUBST([pythondir], [$am_cv_python_pythondir])
 
-  dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
-  dnl   PYTHON_SITE_PACKAGE in previous betas, but this naming is
-  dnl   more consistent with the rest of automake.
+    dnl pkgpythondir -- $PACKAGE directory under pythondir.  Was
+    dnl   PYTHON_SITE_PACKAGE in previous betas, but this naming is
+    dnl   more consistent with the rest of automake.
 
-  AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
+    AC_SUBST([pkgpythondir], [\${pythondir}/$PACKAGE])
 
-  dnl pyexecdir -- directory for installing python extension modules
-  dnl   (shared libraries)
-  dnl Query distutils for this directory.  distutils does not exist in
-  dnl Python 1.5, so we fall back to the hardcoded directory if it
-  dnl doesn't work.
-  AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
-    [am_cv_python_pyexecdir],
-    [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
-     echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
-  AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
+    dnl pyexecdir -- directory for installing python extension modules
+    dnl   (shared libraries)
+    dnl Query distutils for this directory.  distutils does not exist in
+    dnl Python 1.5, so we fall back to the hardcoded directory if it
+    dnl doesn't work.
+    AC_CACHE_CHECK([for $am_display_PYTHON extension module directory],
+      [am_cv_python_pyexecdir],
+      [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null ||
+       echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`])
+    AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
 
-  dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
+    dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE)
 
-  AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
+    AC_SUBST([pkgpyexecdir], [\${pyexecdir}/$PACKAGE])
 
-  dnl Run any user-specified action.
-  $2
+    dnl Run any user-specified action.
+    $2
   fi
 
 ])