From 19639aa9aba38d0db9f3ed40daf4fa9bc5a140d6 Mon Sep 17 00:00:00 2001
From: foobar <sniper@php.net>
Date: Fri, 17 Jun 2005 16:42:54 +0000
Subject: [PATCH] Use the new dependency system

---
 ext/spl/php_spl.c             | 13 +++++++++++++
 ext/sqlite/sqlite.c           |  6 +++---
 ext/xmlreader/php_xmlreader.c |  8 +++++++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index b5d49d7311..900c0974e7 100755
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
@@ -581,10 +581,23 @@ PHP_RSHUTDOWN_FUNCTION(spl) /* {{{ */
 	return SUCCESS;
 } /* }}} */
 
+#ifdef HAVE_SIMPLEXML
+static zend_module_dep spl_deps[] = {
+	ZEND_MOD_REQUIRED("libxml")
+	ZEND_MOD_REQUIRED("simplexml")
+	{NULL, NULL, NULL}
+};
+#endif
+
 /* {{{ spl_module_entry
  */
 zend_module_entry spl_module_entry = {
+#ifdef HAVE_SIMPLEXML
+	STANDARD_MODULE_HEADER_EX, NULL,
+	spl_deps,
+#else
 	STANDARD_MODULE_HEADER,
+#endif
 	"SPL",
 	spl_functions,
 	PHP_MINIT(spl),
diff --git a/ext/sqlite/sqlite.c b/ext/sqlite/sqlite.c
index 7673b428fb..6c1352db65 100644
--- a/ext/sqlite/sqlite.c
+++ b/ext/sqlite/sqlite.c
@@ -275,7 +275,7 @@ static zend_module_dep sqlite_deps[] = {
 #if HAVE_PHP_SESSION && !defined(COMPILE_DL_SESSION)
 	ZEND_MOD_REQUIRED("session")
 #endif
-#if PHP_SQLITE2_HAVE_PDO
+#ifdef PHP_SQLITE2_HAVE_PDO
 	ZEND_MOD_REQUIRED("pdo")
 #endif
 	{NULL, NULL, NULL}
@@ -1096,7 +1096,7 @@ PHP_MINIT_FUNCTION(sqlite)
 	REGISTER_LONG_CONSTANT("SQLITE_ROW",			SQLITE_ROW, CONST_CS|CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("SQLITE_DONE",			SQLITE_DONE, CONST_CS|CONST_PERSISTENT);
 
-#if PHP_SQLITE2_HAVE_PDO
+#ifdef PHP_SQLITE2_HAVE_PDO
     if (FAILURE == php_pdo_register_driver(&pdo_sqlite2_driver)) {
         return FAILURE;
     }
@@ -1109,7 +1109,7 @@ PHP_MSHUTDOWN_FUNCTION(sqlite)
 {
 	UNREGISTER_INI_ENTRIES();
 
-#if PHP_SQLITE2_HAVE_PDO
+#ifdef PHP_SQLITE2_HAVE_PDO
     php_pdo_unregister_driver(&pdo_sqlite2_driver);
 #endif
 
diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c
index 191f878c91..1fe1eb3f8b 100644
--- a/ext/xmlreader/php_xmlreader.c
+++ b/ext/xmlreader/php_xmlreader.c
@@ -276,10 +276,16 @@ static xmlRelaxNGPtr _xmlreader_get_relaxNG(char *source, int source_len, int ty
 }
 #endif
 
+static zend_module_dep xmlreader_deps[] = {
+	ZEND_MOD_REQUIRED("libxml")
+	{NULL, NULL, NULL}
+};
+
 /* {{{ xmlreader_module_entry
  */
 zend_module_entry xmlreader_module_entry = {
-	STANDARD_MODULE_HEADER,
+	STANDARD_MODULE_HEADER_EX, NULL,
+	xmlreader_deps,
 	"xmlreader",
 	NULL,
 	PHP_MINIT(xmlreader),
-- 
2.40.0