jerenkrantz 02/01/18 11:07:05
Modified: . CHANGES
build apu-conf.m4
Log:
Fix expat detection to recognize installed versions.
Submitted by: Eric Gillespie, Jr. <[EMAIL PROTECTED]>
Reviewed by: Justin Erenkrantz
Revision Changes Path
1.51 +3 -0 apr-util/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr-util/CHANGES,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- CHANGES 17 Jan 2002 01:49:23 -0000 1.50
+++ CHANGES 18 Jan 2002 19:07:05 -0000 1.51
@@ -1,5 +1,8 @@
Changes with APR-util b1
+ *) Fix expat detection to recognize installed versions.
+ [Eric Gillespie, Jr. <[EMAIL PROTECTED]>]
+
*) Add find_apu.m4 to allow third-party programs that use APR-util
to have a standard m4 macro for detection. [Justin Erenkrantz]
1.28 +4 -0 apr-util/build/apu-conf.m4
Index: apu-conf.m4
===================================================================
RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- apu-conf.m4 18 Jan 2002 18:14:34 -0000 1.27
+++ apu-conf.m4 18 Jan 2002 19:07:05 -0000 1.28
@@ -393,6 +393,10 @@
dnl Expat 1.95.* distribution
expat_include_dir="$1/lib"
expat_libs="$1/lib/libexpat.la"
+ elif test -r "$1/include/expat.h"; then
+ dnl Expat 1.95.* installation
+ expat_include_dir="$1/include"
+ expat_libs="$1/lib/libexpat.la"
elif test -r "$1/xmlparse.h"; then
dnl maybe an expat-lite. use this dir for both includes and libs
expat_include_dir="$1"
