Change meaning of yes/no re Greg's email

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@91353 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/Configuration.tmpl b/src/Configuration.tmpl
index d7bdd210f43b26a6758ea069dc8aef6df2bab816..345a0a5388d34759981d5d837a872e50049d5a64 100644 (file)
--- a/src/Configuration.tmpl
+++ b/src/Configuration.tmpl
@@ -163,9 +163,9 @@ Rule SHARED_CHAIN=default
 # EXPAT:
 #  Apache requires an Expat package and includes James Clark's Expat
 #  package (expat-lite) with the distribution. This determines
-#  whether you want to include the system's Expat library ('yes'),
-#  expat-lite ('no') or prefer the system Expat if available but choose
-#  expat-lite if not ('default'). Note that if set to 'yes' and
+#  whether you want to include the bundled expat-lite library ('yes'),
+#  the system expat ('no') or prefer the system Expat if available but
+#  choose expat-lite if not ('default'). Note that if set to 'no' and
 #  libexpat.a cannot be found, the build will fail.
 #
 

diff --git a/src/Configure b/src/Configure
index 46b884a76a72f8fcec3633426acbe3aaa45d0245..d2d286e50dc21413b4ab9dea38b54b1a1d909274 100755 (executable)
--- a/src/Configure
+++ b/src/Configure
@@ -1853,17 +1853,17 @@ if [ "x$RULE_WANTHSREGEX" = "xyes" ]; then
 fi
 
 ####################################################################
-## Add in the Expat library. Choose whether we want the system's
-## version ('yes'), our version (expat-lite) ('no') or for Configure
+## Add in the Expat(-lite) library. Choose whether we want the expat-lite
+## version ('yes'), the system's expat ('no') or for Configure
 ## to choose for us ('default' - system is prefered if available).
 ##
 
-if ./helpers/TestCompile lib expat && [ "x$RULE_EXPAT" != "xno" ]; then
+if ./helpers/TestCompile lib expat && [ "x$RULE_EXPAT" != "xyes" ]; then
         echo " + using system Expat"
        LIBS="$LIBS -lexpat"
 else
-    if [ "x$RULE_EXPAT" = "xyes" ]; then
-        echo "ERROR: RULE_EXPAT set to \"yes\" but is not available."
+    if [ "x$RULE_EXPAT" = "xno" ]; then
+        echo "ERROR: RULE_EXPAT set to \"no\" but system expat is not available."
         exit 1
     fi
     if [ ! -d ./lib/expat-lite/ ]; then