diff options
Diffstat (limited to 'ext/xml/config.m4')
| -rw-r--r-- | ext/xml/config.m4 | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index 56445663f9..42dd8182e2 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -3,7 +3,7 @@ dnl $Id$ dnl dnl Fallback for --with-xml[=DIR] -AC_ARG_WITH(xml,[],enable_xml=$withval) +dnl PHP_ARG_WITH(xml,[],enable_xml=$withval) AC_C_BIGENDIAN @@ -20,27 +20,15 @@ PHP_ARG_WITH(expat-dir, external libexpat install dir, [ --with-expat-dir=DIR XML: external libexpat install dir]) if test "$PHP_XML" = "yes"; then + AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) if test "$PHP_EXPAT_DIR" = "no"; then - AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) AC_DEFINE(HAVE_LIBEXPAT_BUNDLED, 1, [ ]) - 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) - PHP_EXTENSION(xml, $ext_shared) - LIB_BUILD($ext_builddir/expat,$ext_shared,yes) - PHP_ADD_INCLUDE($ext_srcdir/expat) - PHP_FAST_OUTPUT($ext_builddir/expat/Makefile) - + PHP_NEW_EXTENSION(xml, xml.c expat/xmlparse.c expat/xmlrole.c expat/xmltok.c, $ext_shared,, -I@ext_srcdir@/expat -DXML_BYTE_ORDER=$order) + PHP_ADD_BUILD_DIR($ext_builddir/expat) else - PHP_EXTENSION(xml, $ext_shared) - PHP_SUBST(EXPAT_SHARED_LIBADD) - AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) + PHP_NEW_EXTENSION(xml, xml.c, $ext_shared) for i in $PHP_XML $PHP_EXPAT_DIR; do if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then @@ -54,5 +42,6 @@ else PHP_ADD_INCLUDE($EXPAT_DIR/include) PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, EXPAT_SHARED_LIBADD) + PHP_SUBST(EXPAT_SHARED_LIBADD) fi fi |