- Make it build with the unbundled libxml again

diff --git a/ext/simplexml/config.m4 b/ext/simplexml/config.m4
index 21eeac8d9c34ee93ea54e161a5ed53ff95d358d4..aa1cf4c917e5146f495ee451cd3b557c4dd90fa7 100644 (file)
--- a/ext/simplexml/config.m4
+++ b/ext/simplexml/config.m4
@@ -5,5 +5,14 @@ PHP_ARG_WITH(simplexml, for simplexml support,
 [  --with-simplexml             Include simplexml support])
 
 if test "$PHP_SIMPLEXML" != "no"; then
-  PHP_NEW_EXTENSION(simplexml, simplexml.c, $ext_shared)
+
+  PHP_LIBXML_DIR=$PHP_SIMPLEXML
+
+  PHP_SETUP_LIBXML(SIMPLEXML_SHARED_LIBADD, [
+    AC_DEFINE(HAVE_SIMPLEXML,1,[ ])
+    PHP_NEW_EXTENSION(simplexml, simplexml.c, $ext_shared)
+    PHP_SUBST(SIMPLEXML_SHARED_LIBADD)
+  ], [
+    AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.])
+  ])
 fi