cvs: php4 /ext/xml Makefile.in config.m4

sas Sun May 20 15:15:26 2001 EDT Modified files: /php4/ext/xml Makefile.in config.m4 Log: Don't add -DXML_BYTE_ORDER to global CPPFLAGS Index: php4/ext/xml/Makefile.in diff -u php4/ext/xml/Makefile.in:1.13 php4/ext/xml/Makefile.in:1.14 --- php4/ext/xml/Makefile.in:1.13 Thu Jan 4 22:36:51 2001 +++ php4/ext/xml/Makefile.in Sun May 20 15:15:25 2001 @@ -6,6 +6,8 @@ LTLIBRARY_SHARED_NAME = xml.la LTLIBRARY_SHARED_LIBADD = $(EXPAT_SHARED_LIBADD) +EXTRA_INCLUDES = $(XML_CPPFLAGS) + SUBDIRS = $(EXPAT_SUBDIRS) include $(top_srcdir)/build/dynlib.mk Index: php4/ext/xml/config.m4 diff -u php4/ext/xml/config.m4:1.27 php4/ext/xml/config.m4:1.28 --- php4/ext/xml/config.m4:1.27 Sat May 12 04:09:01 2001 +++ php4/ext/xml/config.m4 Sun May 20 15:15:25 2001 @@ -1,5 +1,5 @@ # $Source: /local/repository/php4/ext/xml/config.m4,v $ -# $Id: config.m4,v 1.27 2001/05/12 11:09:01 sas Exp $ +# $Id: config.m4,v 1.28 2001/05/20 22:15:25 sas Exp $ dnl Fallback for --with-xml[=DIR] AC_ARG_WITH(xml,[],enable_xml=$withval) @@ -19,9 +19,10 @@ 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)