diff options
| -rw-r--r-- | ext/xml/config.m4 | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index d579451b22..40dabd3e86 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -2,14 +2,6 @@ dnl dnl $Id$ dnl -AC_C_BIGENDIAN - -if test "$ac_cv_c_bigendian" = "yes"; then - order=4321 -else - order=1234 -fi - PHP_ARG_ENABLE(xml,whether to enable XML support, [ --disable-xml Disable XML support using bundled expat lib], yes) @@ -19,14 +11,11 @@ PHP_ARG_WITH(expat-dir, 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_BUNDLED, 1, [ ]) - PHP_NEW_EXTENSION(xml, xml.c expat/xmlparse.c expat/xmlrole.c expat/xmltok.c, $ext_shared,,-DBYTEORDER=$order) - PHP_ADD_INCLUDE($ext_srcdir/expat) - PHP_ADD_BUILD_DIR($ext_builddir/expat) - else - PHP_NEW_EXTENSION(xml, xml.c, $ext_shared) + if test "$PHP_EXPAT_DIR" = "no" && test "$PHP_BUNDLE_EXPAT" = "no"; then + AC_MSG_ERROR(xml support is enabled, however the expat bundle is disabled and no external expat directory was specified.) + fi + if test "$PHP_EXPAT_DIR" != "no"; then 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 EXPAT_DIR=$i @@ -41,4 +30,6 @@ if test "$PHP_XML" = "yes"; then PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD) PHP_SUBST(XML_SHARED_LIBADD) fi + + PHP_NEW_EXTENSION(xml, xml.c, $ext_shared) fi |