Don't add -DXML_BYTE_ORDER to global CPPFLAGS

diff --git a/ext/xml/Makefile.in b/ext/xml/Makefile.in
index b685c9a67cdff714b31a46a0bcae3de98585c7ff..bd73d30d44895723da3a6f19b0c42e168381592b 100644 (file)
--- a/ext/xml/Makefile.in
+++ b/ext/xml/Makefile.in
@@ -6,6 +6,8 @@ LTLIBRARY_LIBADD        = $(LTLIBRARY_DEPENDENCIES)
 LTLIBRARY_SHARED_NAME   = xml.la
 LTLIBRARY_SHARED_LIBADD = $(EXPAT_SHARED_LIBADD)
 
+EXTRA_INCLUDES = $(XML_CPPFLAGS)
+       
 SUBDIRS = $(EXPAT_SUBDIRS)
 
 include $(top_srcdir)/build/dynlib.mk

diff --git a/ext/xml/config.m4 b/ext/xml/config.m4
index 4f8c27616e13442af4367bd8b1360d8ddc490c0f..f0770d98bae7f83b07989d8a959a8790599edca7 100644 (file)
--- a/ext/xml/config.m4
+++ b/ext/xml/config.m4
@@ -19,9 +19,10 @@ if test "$PHP_XML" != "no"; then
   if test "$PHP_XML" = "yes"; then
     AC_DEFINE(HAVE_LIBEXPAT, 1, [ ])
     AC_DEFINE(HAVE_LIBEXPAT_BUNDLED, 1, [ ])
-    CPPFLAGS="$CPPFLAGS -DXML_BYTE_ORDER=$order"
+    XML_CPPFLAGS=-DXML_BYTE_ORDER=$order
     EXPAT_INTERNAL_LIBADD=expat/libexpat.la
     PHP_SUBST(EXPAT_INTERNAL_LIBADD)
+    PHP_SUBST(XML_CPPFLAGS)
     EXPAT_SUBDIRS=expat
     PHP_SUBST(EXPAT_SUBDIRS)
     PHP_SUBST(EXPAT_SHARED_LIBADD)