diff options
Diffstat (limited to 'ext/xml/config.m4')
| -rw-r--r-- | ext/xml/config.m4 | 48 |
1 files changed, 40 insertions, 8 deletions
diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index e48ec51592..ca5ea4f55b 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -16,13 +16,45 @@ PHP_ARG_ENABLE(xml,for XML support, [ --disable-xml Disable XML support using bundled expat lib], yes) if test "$PHP_XML" != "no"; then + + AC_MSG_CHECKING(for expat in default path) + for i in /usr/local /usr; do + if test -r $i/include/expat.h; then + EXPAT_DIR=$i + AC_MSG_RESULT(found in $i) + fi + done + AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) - CPPFLAGS="$CPPFLAGS -DXML_BYTE_ORDER=$order" - PHP_EXTENSION(xml, $ext_shared) - LIB_BUILD($ext_builddir/expat,$ext_shared,yes) - LIB_BUILD($ext_builddir/expat/xmlparse,$ext_shared,yes) - LIB_BUILD($ext_builddir/expat/xmltok,$ext_shared,yes) - AC_ADD_INCLUDE($ext_srcdir/expat/xmltok) - AC_ADD_INCLUDE($ext_srcdir/expat/xmlparse) - PHP_FAST_OUTPUT($ext_builddir/expat/Makefile $ext_builddir/expat/xmlparse/Makefile $ext_builddir/expat/xmltok/Makefile) + + if test -z "$EXPAT_DIR"; then + CPPFLAGS="$CPPFLAGS -DXML_BYTE_ORDER=$order" + EXPAT_INTERNAL_LIBADD="expat/libexpat.la" + PHP_SUBST(EXPAT_INTERNAL_LIBADD) + 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) + LIB_BUILD($ext_builddir/expat/xmlparse,$ext_shared,yes) + LIB_BUILD($ext_builddir/expat/xmltok,$ext_shared,yes) + AC_ADD_INCLUDE($ext_srcdir/expat/xmltok) + AC_ADD_INCLUDE($ext_srcdir/expat/xmlparse) + PHP_FAST_OUTPUT($ext_builddir/expat/Makefile $ext_builddir/expat/xmlparse/Makefile $ext_builddir/expat/xmltok/Makefile) + + else + + if test -f $EXPAT/lib/libexpat.a -o -f $EXPAT_DIR/lib/libexpat.so ; then + AC_DEFINE(HAVE_LIBEXPAT2, 1, [ ]) + AC_ADD_INCLUDE($EXPAT_DIR/include) + AC_ADD_LIBRARY(expat) + else + AC_MSG_RESULT(not found) + AC_MSG_ERROR(Please reinstall the expat distribution) + fi + + PHP_SUBST(EXPAT_SHARED_LIBADD) + AC_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, EXPAT_SHARED_LIBADD) + PHP_EXTENSION(xml, $ext_shared) + fi fi |