coar 01/03/11 14:41:33
Modified: build apu-conf.m4
Log:
Work around poor assumptions used to determine whether expat
is already available. The old assumptions found PHP4's
provided files and varfed.
Submitted by: Chuck Murcko
Reviewed by: Ken Coar
Revision Changes Path
1.7 +6 -3 apr-util/build/apu-conf.m4
Index: apu-conf.m4
===================================================================
RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- apu-conf.m4 2001/03/09 14:37:20 1.6
+++ apu-conf.m4 2001/03/11 22:41:33 1.7
@@ -298,12 +298,14 @@
expat_include_dir="$1"
expat_libs="$1/libexpat.la"
expat_old=yes
- elif test -r "$1/include/xmlparse.h"; then
+ elif test -r "$1/include/xmlparse.h" -a \
+ -r "$1/lib/libexpat.a"; then
dnl ### who is this?
expat_include_dir="$1/include"
expat_libs="-L$1/lib -lexpat"
expat_old=yes
- elif test -r "$1/include/xml/xmlparse.h"; then
+ elif test -r "$1/include/xml/xmlparse.h" -a \
+ -r "$1/lib/xml/libexpat.a"; then
dnl ### who is this?
expat_include_dir="$1/include/xml"
expat_libs="-L$1/lib -lexpat"
@@ -313,7 +315,8 @@
expat_include_dir="$1/include/xmltok"
expat_libs="-L$1/lib -lxmlparse -lxmltok"
expat_old=yes
- elif test -r "$1/xmlparse/xmlparse.h"; then
+ elif test -r "$1/xmlparse/xmlparse.h" -a \
+ -r "$1/lib/xmlparse/libexpat.a"; then
dnl Expat 1.0 or 1.1 source directory
expat_include_dir="$1/xmlparse"
expat_libs="-L$1 -lexpat"
