Index: m4/python.m4
===================================================================
RCS file: /cvsroot/automake/automake/m4/python.m4,v
retrieving revision 1.17
diff -u -b -r1.17 python.m4
--- m4/python.m4	26 Mar 2004 21:00:47 -0000	1.17
+++ m4/python.m4	5 Nov 2004 09:40:36 -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
     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,16 +79,14 @@
 	  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
+  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