diff options
| author | Sascha Schumann <sas@php.net> | 2001-05-20 22:15:25 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2001-05-20 22:15:25 +0000 |
| commit | 244ea9f6c81979386ecfd281dac0979b3d8fe717 (patch) | |
| tree | 64b1824a99656b958fd9444a1ad5fc6c65b471e9 | |
| parent | c9023bdcaefadd7a43381a2e53ccf39108015c43 (diff) | |
| download | php-git-244ea9f6c81979386ecfd281dac0979b3d8fe717.tar.gz | |
Don't add -DXML_BYTE_ORDER to global CPPFLAGS
| -rw-r--r-- | ext/xml/Makefile.in | 2 | ||||
| -rw-r--r-- | ext/xml/config.m4 | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ext/xml/Makefile.in b/ext/xml/Makefile.in index b685c9a67c..bd73d30d44 100644 --- 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 4f8c27616e..f0770d98ba 100644 --- 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) |