php-xml-force-expat.patch

   1 --- php-5.2.7/ext/xml.org/config.m4     2005-12-22 09:57:38.000000000 +0100
   2 +++ php-5.2.7/ext/xml/config.m4 2008-12-06 12:13:57.781991558 +0100
   3 @@ -5,11 +5,6 @@
   4  PHP_ARG_ENABLE(xml,whether to enable XML support,
   5  [  --disable-xml           Disable XML support], yes)
   6
   7 -if test -z "$PHP_LIBXML_DIR"; then
   8 -  PHP_ARG_WITH(libxml-dir, libxml2 install dir,
   9 -  [  --with-libxml-dir=DIR     XML: libxml2 install prefix], no, no)
  10 -fi
  11 -
  12  PHP_ARG_WITH(libexpat-dir, libexpat install dir,
  13  [  --with-libexpat-dir=DIR   XML: libexpat install prefix (deprecated)], no, no)
  14
  15 @@ -19,17 +14,7 @@
  16    dnl Default to libxml2 if --with-libexpat-dir is not used.
  17    dnl
  18    if test "$PHP_LIBEXPAT_DIR" = "no"; then
  19 -
  20 -    if test "$PHP_LIBXML" = "no"; then
  21 -      AC_MSG_ERROR([XML extension requires LIBXML extension, add --enable-libxml])
  22 -    fi
  23 -
  24 -    PHP_SETUP_LIBXML(XML_SHARED_LIBADD, [
  25 -      xml_extra_sources="compat.c"
  26 -      PHP_ADD_EXTENSION_DEP(xml, libxml)
  27 -    ], [
  28 -      AC_MSG_ERROR([xml2-config not found. Use --with-libxml-dir=<DIR>])
  29 -    ])
  30 +      AC_MSG_ERROR([XML extension requires EXPAT extension, add --enable-expat])
  31    fi
  32
  33    dnl