chuck 01/03/11 23:26:11
Modified: build apu-conf.m4
Log:
Explain workaround; remove dubious expat 1.0 check for lib
Revision Changes Path
1.8 +3 -4 apr-util/build/apu-conf.m4
Index: apu-conf.m4
===================================================================
RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- apu-conf.m4 2001/03/11 22:41:33 1.7
+++ apu-conf.m4 2001/03/12 07:26:11 1.8
@@ -300,13 +300,13 @@
expat_old=yes
elif test -r "$1/include/xmlparse.h" -a \
-r "$1/lib/libexpat.a"; then
- dnl ### who is this?
+ dnl previously installed expat
expat_include_dir="$1/include"
expat_libs="-L$1/lib -lexpat"
expat_old=yes
elif test -r "$1/include/xml/xmlparse.h" -a \
-r "$1/lib/xml/libexpat.a"; then
- dnl ### who is this?
+ dnl previously installed expat
expat_include_dir="$1/include/xml"
expat_libs="-L$1/lib -lexpat"
expat_old=yes
@@ -315,8 +315,7 @@
expat_include_dir="$1/include/xmltok"
expat_libs="-L$1/lib -lxmlparse -lxmltok"
expat_old=yes
- elif test -r "$1/xmlparse/xmlparse.h" -a \
- -r "$1/lib/xmlparse/libexpat.a"; then
+ elif test -r "$1/xmlparse/xmlparse.h"; then
dnl Expat 1.0 or 1.1 source directory
expat_include_dir="$1/xmlparse"
expat_libs="-L$1 -lexpat"
