[Zope-CVS] CVS: Zope - configure:1.1.4.3

Chris McDonough chrism@zope.com
Mon, 26 Aug 2002 12:38:23 -0400


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

Modified Files:
      Tag: chrism-install-branch
	configure 
Log Message:
Fix thinko found by Matt Behrens.


=== Zope/configure 1.1.4.2 => 1.1.4.3 ===
--- Zope/configure:1.1.4.2	Mon Aug 26 02:22:36 2002
+++ Zope/configure	Mon Aug 26 12:38:23 2002
@@ -12,6 +12,7 @@
 ACCEPTABLE="2.1.2 2.1.1 2.1.0 2.2 2.2.1"
 EXENAMES="python python2 python2.1 python2.2"
 FOUND=""
+VERSION=""
 echo
 echo "Configuring Zope installation"
 echo
@@ -23,14 +24,14 @@
         full="$dir/$executable"
         if [ -x $full ]; then
             cmd="import string,sys;print string.split(sys.version)[0]"
-            version=`$full -c "$cmd"`
-            echo "  Python version $version found at $full"
-            if [ $version = $TARGET ]; then
+            VERSION=`$full -c "$cmd"`
+            echo "  Python version $VERSION found at $full"
+            if [ $VERSION = $TARGET ]; then
                 FOUND=$full
 		break 2
             else
                 for acceptable in $ACCEPTABLE; do
-                    if [ $version = $acceptable ]; then
+                    if [ $VERSION = $acceptable ]; then
                         FOUND=$full
                     fi
                 done
@@ -39,17 +40,17 @@
     done
 done
 echo
-PYTHON=$full
+PYTHON=$FOUND
 if [ -z "$FOUND" ]; then
     echo "  No suitable Python version found.  You must install Python"
     echo "  version $TARGET before continuing.  Versions $ACCEPTABLE"
     echo "  also work, but not as optimally."
     exit 127
-elif [ $version = $TARGET ]; then
+elif [ $VERSION = $TARGET ]; then
     echo "  The optimimum Python version ($TARGET) was found at $full."
 else
     echo "  !! WARNING !! "
-    echo "  An acceptable, but non-optimal version of Python ($version) was"
+    echo "  An acceptable, but non-optimal version of Python ($VERSION) was"
     echo "  found at '$full' but consider installing version $TARGET"
     echo "  before running 'make'."
 fi