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

[Chris McDonough]

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

Modified Files:
	configure 
Log Message:
Make --quiet quieter.


=== Zope/configure 1.7 => 1.8 ===
--- Zope/configure:1.7	Fri Jun 13 11:42:25 2003
+++ Zope/configure	Fri Jun 13 12:43:05 2003
@@ -32,6 +32,9 @@
 # where are we?
 HERE=`dirname $0`
 
+# should we be quiet?
+QUIET=""
+
 usage()
 {
     echo
@@ -61,8 +64,8 @@
     FOUND=""
     VERSION=""
     FOUNDLIST=""
-    echo "Testing for an acceptable Python interpreter..."
-    echo
+    out "Testing for an acceptable Python interpreter..."
+    out ""
     for DIR in $PATH; do
         IFS="$OLDIFS"
         for EXECUTABLE in $EXENAMES; do
@@ -72,7 +75,7 @@
 		# Strip trailing + from version number
 		CMD="$CMD;a=(a[-1]=='+')and(a[:-1])or(a);print a"
                 VERSION=`$FULL -c "$CMD"`
-                echo "  Python version $VERSION found at $FULL"
+                out "  Python version $VERSION found at $FULL"
                 if [ "$VERSION" = "$TARGET" ]; then
                     FOUND="$FULL"
                     FOUNDVERSION=$VERSION
@@ -103,14 +106,14 @@
         done
     done
     if [ "$VERSION" = "$TARGET" ]; then
-        echo
-        echo "  The optimimum Python version ($TARGET) was found at $FOUND."
+        out ""
+        out "  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."
+        out ""
+        out "  No suitable Python version found.  You should install"
+        out "  Python version $TARGET before continuing.  Versions"
+        out "  $ACCEPTABLE also work, but not as optimally."
         exit 1
     else
         if   [ -n "$FOUND1" ]; then
@@ -132,17 +135,23 @@
             FOUND=$FOUND6
             FOUNDVERSION=$FOUNDVERSION6
         fi
-        echo
-        echo "  !! WARNING !! "
-        echo "  An acceptable, but non-optimal Python version ($FOUNDVERSION) "
-        echo "  was found at '$FOUND'."
-        echo "  But consider installing version '$TARGET' before running "
-        echo "  'make'.  If this isn't the Python version or interpreter "
-        echo "  instance you wish to use, you may specify a Python interpreter"
-        echo "  manually by rerunning the ./configure script with the "
-        echo "  '--with-python' option."
+        out ""
+        out "  !! WARNING !! "
+        out "  An acceptable, but non-optimal Python version ($FOUNDVERSION) "
+        out "  was found at '$FOUND'."
+        out "  But consider installing version '$TARGET' before running "
+        out "  'make'.  If this isn't the Python version or interpreter "
+        out "  instance you wish to use, you may specify a Python interpreter"
+        out "  manually by rerunning the ./configure script with the "
+        out "  '--with-python' option."
+    fi
+out ""
+}
+
+out() {
+    if [ -z $QUIET ]; then
+      echo $1
     fi
-echo
 }
 
 NEWOPTS=""
@@ -160,8 +169,12 @@
         FOUND=`echo $OPT | sed -e 's/--with-python\=//'`
         # use eval to do tilde expansion below
         eval "FOUND='$FOUND'"
-        echo
-        echo "Using Python interpreter at $FOUND"
+        out ""
+        out "Using Python interpreter at $FOUND"
+        ;;
+    --quiet* | -q*)
+        QUIET="true"
+        NEWOPTS="$NEWOPTS $OPT"
         ;;
     *)
         NEWOPTS="$NEWOPTS $OPT"
@@ -169,9 +182,9 @@
     esac
 done
 
-echo
-echo "Configuring Zope installation"
-echo
+out ""
+out "Configuring Zope installation"
+out ""
 
 if [ -z "$FOUND" ]; then
     get_python