[Zope-Checkins] CVS: Zope - configure:1.1.4.17

Chris McDonough chrism@zope.com
Tue, 26 Nov 2002 00:17:14 -0500


Update of /cvs-repository/Zope
In directory cvs.zope.org:/tmp/cvs-serv7268

Modified Files:
      Tag: chrism-install-branch
	configure 
Log Message:
Reorder tests to make target version detection work properly.


=== Zope/configure 1.1.4.16 => 1.1.4.17 ===
--- Zope/configure:1.1.4.16	Tue Nov 26 00:03:41 2002
+++ Zope/configure	Tue Nov 26 00:17:14 2002
@@ -83,16 +83,16 @@
 	    fi
 	done
     done
-    if [ -z "$FOUND1" ] && [ -z "$FOUND2" ] && [ -z "$FOUND3" ] && 
-       [ -z "$FOUND4" ] && [ -z "$FOUND5" ] && [ -z "$FOUND6" ] ; then
+    if [ "$VERSION" = "$TARGET" ]; then
+        echo
+	echo "  The optimimum Python version ($TARGET) was found at $FOUND."
+    elif [ -z "$FOUND1" ] && [ -z "$FOUND2" ] && [ -z "$FOUND3" ] && 
+         [ -z "$FOUND4" ] && [ -z "$FOUND5" ] && [ -z "$FOUND6" ] ; then
         echo
 	echo "  No suitable Python version found.  You should install Python"
 	echo "  version $TARGET before continuing.  Versions $ACCEPTABLE"
 	echo "  also work, but not as optimally."
 	exit 127
-    elif [ "$FOUNDVERSION" = "$TARGET" ]; then
-        echo
-	echo "  The optimimum Python version ($TARGET) was found at $FOUND."
     else
         if   [ -n "$FOUND1" ]; then
             FOUND=$FOUND1