Fix some misbehaving pecls (my own included ;-)

diff --git a/ext/enchant/config.w32 b/ext/enchant/config.w32
index 5be9572057fe4ec99508f86ad665fb886e2effde..f9ba6beafc3328372fd95d895eba2e96daf5059b 100644 (file)
--- a/ext/enchant/config.w32
+++ b/ext/enchant/config.w32
@@ -4,6 +4,10 @@
 ARG_ENABLE("enchant", "Enchant Support", "no");
 
 if (PHP_ENCHANT == "yes") {
-       EXTENSION("enchant", "enchant.c");
-       AC_DEFINE('HAVE_ENCHANT', 1, 'Have Enchant support', false);
+       if (CHECK_HEADER_ADD_INCLUDE("enchant.h", "CFLAGS_ENCHANT", PHP_ENCHANT)) {
+               EXTENSION("enchant", "enchant.c");
+               AC_DEFINE('HAVE_ENCHANT', 1, 'Have Enchant support', false);
+       } else {
+               WARNING('Could not find enchant.h; skipping');
+       }
 }

diff --git a/ext/pdo_oci/oci_driver.c b/ext/pdo_oci/oci_driver.c
index 6d56186296add85c029508923f03120c02ad6956..0793a32e7a4857998c42704be93d1065d63a40da 100755 (executable)
--- a/ext/pdo_oci/oci_driver.c
+++ b/ext/pdo_oci/oci_driver.c
@@ -29,6 +29,7 @@
 #include "pdo/php_pdo_driver.h"
 #include "php_pdo_oci.h"
 #include "php_pdo_oci_int.h"
+#include "Zend/zend_exceptions.h"
 
 static int pdo_oci_fetch_error_func(pdo_dbh_t *dbh, pdo_stmt_t *stmt, zval *info TSRMLS_DC) /* {{{ */
 {

diff --git a/ext/pdo_oci/oci_statement.c b/ext/pdo_oci/oci_statement.c
index d22f93b542bd6a5d8b5c6075afbccdb9f0f1920a..07b2237d94e789663938711f37198d2222432acc 100755 (executable)
--- a/ext/pdo_oci/oci_statement.c
+++ b/ext/pdo_oci/oci_statement.c
@@ -29,6 +29,7 @@
 #include "pdo/php_pdo_driver.h"
 #include "php_pdo_oci.h"
 #include "php_pdo_oci_int.h"
+#include "Zend/zend_extensions.h"
 
 #define STMT_CALL(name, params)        \
        S->last_err = name params; \

diff --git a/ext/xmlwriter/config.w32 b/ext/xmlwriter/config.w32
index 029618aebde627dd26e352f738c3770ee1357bec..c18b2c13fd5e37464bdcf2ed9f2500b673371de7 100644 (file)
--- a/ext/xmlwriter/config.w32
+++ b/ext/xmlwriter/config.w32
@@ -4,11 +4,15 @@
 ARG_WITH("xmlwriter", "XMLWriter support", "no");
 
 if (PHP_XMLWRITER == "yes" && PHP_LIBXML == "yes") {
-       EXTENSION("xmlwriter", "php_xmlwriter.c");
-       AC_DEFINE("HAVE_XMLWRITER", 1, "XMLWriter support");
-       if (!PHP_XMLWRITER_SHARED) {
-               ADD_FLAG("CFLAGS_XMLWRITER", "/D LIBXML_STATIC");
+       if (CHECK_HEADER_ADD_INCLUDE('libxml/xmlwriter.h', 'CFLAGS_XMLWRITER', PHP_XMLWRITER)) {
+               EXTENSION("xmlwriter", "php_xmlwriter.c");
+               AC_DEFINE("HAVE_XMLWRITER", 1, "XMLWriter support");
+               if (!PHP_XMLWRITER_SHARED) {
+                       ADD_FLAG("CFLAGS_XMLWRITER", "/D LIBXML_STATIC");
+               }
+               ADD_EXTENSION_DEP('xmlwriter', 'libxml');
+       } else {
+               WARNING('Could not find xmlwriter.h');
        }
-       ADD_EXTENSION_DEP('xmlwriter', 'libxml');
 }