From: Wez Furlong <wez@php.net>
Date: Sat, 31 Jul 2004 18:46:18 +0000 (+0000)
Subject: Fix some misbehaving pecls (my own included ;-)
X-Git-Tag: PRE_ZEND_VM_DISPATCH_PATCH~291
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=83472de48e21e64f9d19e95a978f2cfb8533e9bb;p=php

Fix some misbehaving pecls (my own included ;-)
---

diff --git a/ext/enchant/config.w32 b/ext/enchant/config.w32
index 5be9572057..f9ba6beafc 100644
--- 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 6d56186296..0793a32e7a 100755
--- 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 d22f93b542..07b2237d94 100755
--- 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 029618aebd..c18b2c13fd 100644
--- 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');
 }