Backout the EXPAT blarf. Modify the description

of EXPAT to explain about the Expat search order, which is new

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

diff --git a/src/CHANGES b/src/CHANGES
index d8761819071991cde588de54b70b4b25d5959115..96c2aa773172bb715230490c30bb5d03c71fdce9 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -3,11 +3,6 @@ Changes with Apache 1.3.22
   *) PORT: Support AtheOS (see www.atheos.cx)
      [Rodrigo Parra Novo <rodarvus@terra.com.br>]
 
-  *) Change to the EXPAT rule logic. We can now use the system's expat
-     library if we want, use our own expat-lite or have Configure
-     pick one for us (prefer system, but use expat-lite as a backup).
-     [Jim Jagielski, Greg Stein]
-
   *) The manual directory is still configurable (as enabled by
      the 1.3.21 change), but its default setting was reverted to
      the pre-1.3.21 default as a subdirectory of the DocumentRoot.

diff --git a/src/Configuration.tmpl b/src/Configuration.tmpl
index 345a0a5388d34759981d5d837a872e50049d5a64..6e8e1409494d2c997963f713353b09e1397a4de8 100644 (file)
--- a/src/Configuration.tmpl
+++ b/src/Configuration.tmpl
@@ -161,12 +161,19 @@ Rule SHARED_CHAIN=default
 #  actually print-out the code that the modules execute
 #
 # 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 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.
+#  Include an Expat implementation into Apache, for use by the
+#  modules. James Clark's Expat package (expat-lite) is bundled
+#  with Apache for the convenience of our users. If set to 'yes'
+#  OR set to 'default' and lib/expat-lite is present, then Apache
+#  will look for an appropriate Expat implementation, prefering
+#  a system Expat library but using expat-lite as an alternate.
+#  If set to 'no' OR set to 'default' and the lib/expat-lite directory
+#  is not available, the no Expat will be included.
+
+The "default" is to
+#  include it if the lib/expat-lite/ directory is present. If the
+#  directory is not present, the "default" is to not include any Expat
+#  implementation. 
 #
 
 Rule SOCKS4=no

diff --git a/src/Configure b/src/Configure
index d2d286e50dc21413b4ab9dea38b54b1a1d909274..043af6525078b8c379b48c829501ed5df19d226a 100755 (executable)
--- a/src/Configure
+++ b/src/Configure
@@ -1853,27 +1853,33 @@ if [ "x$RULE_WANTHSREGEX" = "xyes" ]; then
 fi
 
 ####################################################################
-## 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).
+## Add in the Expat library if needed/wanted.
 ##
 
-if ./helpers/TestCompile lib expat && [ "x$RULE_EXPAT" != "xyes" ]; then
-        echo " + using system Expat"
-       LIBS="$LIBS -lexpat"
-else
-    if [ "x$RULE_EXPAT" = "xno" ]; then
-        echo "ERROR: RULE_EXPAT set to \"no\" but system expat is not available."
-        exit 1
+# set the default, based on whether expat-lite is bundled. if it is present,
+# then we can always include expat.
+if [ "x$RULE_EXPAT" = "xdefault" ]; then
+    if [ -d ./lib/expat-lite/ ]; then
+        RULE_EXPAT=yes
+    else
+        RULE_EXPAT=no
     fi
-    if [ ! -d ./lib/expat-lite/ ]; then
-        echo "Bundled expat-lite package not available."
-       exit 1
+fi
+
+if [ "x$RULE_EXPAT" = "xyes" ]; then
+    if ./helpers/TestCompile lib expat; then
+        echo " + using system Expat"
+        LIBS="$LIBS -lexpat"
+    else
+        if [ ! -d ./lib/expat-lite/ ]; then
+            echo "ERROR: RULE_EXPAT set to \"yes\" but is not available."
+           exit 1
+        fi
+        echo " + using builtin Expat"
+        EXPATLIB="lib/expat-lite/libexpat.a"
+        APLIBDIRS="expat-lite $APLIBDIRS"
+        CFLAGS="$CFLAGS -DUSE_EXPAT -I\$(SRCDIR)/lib/expat-lite"
     fi
-    echo " + using builtin Expat"
-    EXPATLIB="lib/expat-lite/libexpat.a"
-    APLIBDIRS="expat-lite $APLIBDIRS"
-    CFLAGS="$CFLAGS -DUSE_EXPAT -I\$(SRCDIR)/lib/expat-lite"
 fi
 
 ####################################################################