diff options
| author | Sterling Hughes <sterling@php.net> | 2003-05-06 19:38:49 +0000 |
|---|---|---|
| committer | Sterling Hughes <sterling@php.net> | 2003-05-06 19:38:49 +0000 |
| commit | a0351b093f43f9c2be5b45d6e08542adb4de419a (patch) | |
| tree | c40e915b27205178d43cd88ee35cebf3d12e9eb1 /ext/xml/config.m4 | |
| parent | 33a10b342ec8104133699e796fb77e9c55c8eb38 (diff) | |
| download | php-git-a0351b093f43f9c2be5b45d6e08542adb4de419a.tar.gz | |
Bundle libxml and add compatibility layer
Diffstat (limited to 'ext/xml/config.m4')
| -rw-r--r-- | ext/xml/config.m4 | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index 40dabd3e86..c4c2de4aa6 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -5,31 +5,12 @@ dnl PHP_ARG_ENABLE(xml,whether to enable XML support, [ --disable-xml Disable XML support using bundled expat lib], yes) -PHP_ARG_WITH(expat-dir, external libexpat install dir, -[ --with-expat-dir=DIR XML: external libexpat install dir], no, no) - if test "$PHP_XML" = "yes"; then - AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) - - 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 - fi - done - - if test -z "$EXPAT_DIR"; then - AC_MSG_ERROR(not found. Please reinstall the expat distribution.) - fi + AC_DEFINE(HAVE_XML, 1, [ ]) - PHP_ADD_INCLUDE($EXPAT_DIR/include) - PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD) - PHP_SUBST(XML_SHARED_LIBADD) - fi + if test "$PHP_BUNDLE_EXPAT" = "no" && test "$PHP_BUNDLE_LIBXML" = "no"; then + AC_MSG_ERROR(xml support is enabled, however both xml libraries have been disabled.) + fi - PHP_NEW_EXTENSION(xml, xml.c, $ext_shared) + PHP_NEW_EXTENSION(xml, compat.c xml.c, $ext_shared) fi |