]>
Commit | Line | Data |
---|---|---|
89584913 | 1 | --- php-4.0.6/ext/domxml/config.m4~ Thu Nov 15 00:32:45 2001 |
2 | +++ php-4.0.6/ext/domxml/config.m4 Thu Nov 15 00:32:45 2001 | |
3 | @@ -3,7 +3,7 @@ | |
4 | ||
5 | AC_DEFUN(PHP_DOM_CHECK_VERSION,[ | |
6 | old_CPPFLAGS=$CPPFLAGS | |
7 | - CPPFLAGS=-I$DOMXML_DIR/include | |
8 | + CPPFLAGS=-I$DOMXML_DIR/include/libxml2 | |
9 | AC_MSG_CHECKING(for libxml version) | |
10 | AC_EGREP_CPP(yes,[ | |
11 | #include <libxml/xmlversion.h> | |
12 | @@ -25,12 +25,12 @@ | |
13 | ||
14 | if test "$PHP_DOM" != "no"; then | |
15 | ||
16 | - if test -r $PHP_DOM/include/libxml/tree.h; then | |
17 | + if test -r $PHP_DOM/include/libxml2/libxml/tree.h; then | |
18 | DOMXML_DIR=$PHP_DOM | |
19 | else | |
20 | AC_MSG_CHECKING(for DOM in default path) | |
21 | for i in /usr/local /usr; do | |
22 | - if test -r $i/include/libxml/tree.h; then | |
23 | + if test -r $i/include/libxml2/libxml/tree.h; then | |
24 | DOMXML_DIR=$i | |
25 | AC_MSG_RESULT(found in $i) | |
26 | fi | |
27 | --- php-4.0.6/ext/domxml/Makefile.in~ Thu Nov 15 01:20:18 2001 | |
28 | +++ php-4.0.6/ext/domxml/Makefile.in Thu Nov 15 01:20:18 2001 | |
29 | @@ -5,4 +5,6 @@ | |
30 | LTLIBRARY_SHARED_NAME = domxml.la | |
31 | LTLIBRARY_SHARED_LIBADD = $(DOMXML_SHARED_LIBADD) | |
32 | ||
33 | +EXTRA_CFLAGS = `pkg-config libxml-2.0 --cflags` | |
34 | + | |
35 | include $(top_srcdir)/build/dynlib.mk |