gstein 01/10/03 05:59:04
Modified: src Configure
Log:
Use an installed Expat when available, rather than the builtin one.
Presuming the installed one is a shared library, then this should resolve
some of the longstanding issues with mod_perl / XML::Parser::Expat.
Revision Changes Path
1.433 +19 -10 apache-1.3/src/Configure
Index: Configure
===================================================================
RCS file: /home/cvs/apache-1.3/src/Configure,v
retrieving revision 1.432
retrieving revision 1.433
diff -u -r1.432 -r1.433
--- Configure 2001/10/02 11:11:52 1.432
+++ Configure 2001/10/03 12:59:03 1.433
@@ -1834,22 +1834,31 @@
####################################################################
## Add in the Expat library if needed/wanted.
##
-if [ -d ./lib/expat-lite/ ]; then
- if [ "x$RULE_EXPAT" = "xdefault" ]; then
+
+# 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
- fi
-else
- if [ "$xRULE_EXPAT" = "xyes" ]; then
- echo "ERROR: RULE_EXPAT set to \"yes\" but is not available."
- exit 1
else
RULE_EXPAT=no
fi
fi
+
if [ "x$RULE_EXPAT" = "xyes" ]; then
- EXPATLIB="lib/expat-lite/libexpat.a"
- APLIBDIRS="expat-lite $APLIBDIRS"
- CFLAGS="$CFLAGS -DUSE_EXPAT -I\$(SRCDIR)/lib/expat-lite"
+ if ./helpers/TestCompile lib expat; then
+ echo " + using system Expat"
+ LIBS="$LIBS -lexpat"
+ else
+ if [ "$xRULE_EXPAT" = "xyes" ]; 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
fi
####################################################################
|