fix for missing include path in CFLAGS

diff --git a/ext/xml/Makefile.am b/ext/xml/Makefile.am
index 9b6e9cdec49b90afcf40827b95065f3f4f6974db..9f2ca1b1bea3cb410fc395d61b71b25d6e7f676d 100644 (file)
--- a/ext/xml/Makefile.am
+++ b/ext/xml/Makefile.am
@@ -3,7 +3,7 @@
 phplibdir=$(libdir)/php
 
 SRC=xml.c
-INCLUDES=@INCLUDES@ @XML_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend
+INCLUDES=@INCLUDES@ -I@top_srcdir@ -I@top_srcdir@/libzend
 noinst_LIBRARIES=libphpext_xml.a
 phplib_LTLIBRARIES=libphpext_xml.la
 libphpext_xml_a_SOURCES=$(SRC)

diff --git a/ext/xml/config.m4 b/ext/xml/config.m4
index 86853a326f7574133dd139e35c82ac19a0cf29c0..daba7bfc0a82ff97729ea0ae50901a9534c81950 100644 (file)
--- a/ext/xml/config.m4
+++ b/ext/xml/config.m4
@@ -34,12 +34,13 @@ AC_ARG_WITH(xml,
     else
       XML_LIBS="-L$withval/lib -lexpat"
       if test -d $withval/include/xml; then
-       XML_INCLUDE="-I$withval/include/xml"
+       XML_INCLUDE="$withval/include/xml"
       else
-       XML_INCLUDE="-I$withval/include"
+       XML_INCLUDE="$withval/include"
       fi
     fi
     AC_DEFINE(HAVE_LIBEXPAT, 1)
+    AC_ADD_INCLUDE($XML_INCLUDE)
     PHP_EXTENSION(xml, $shared)
     if test "$shared" != "yes"; then
       EXTRA_LIBS="$EXTRA_LIBS $XML_LIBS"
@@ -51,4 +52,3 @@ AC_ARG_WITH(xml,
   AC_MSG_RESULT(no)
 ]) 
 AC_SUBST(XML_LIBS)
-AC_SUBST(XML_INCLUDE)