From: Pierre Joye <pajoye@php.net>
Date: Sun, 14 Nov 2010 22:40:30 +0000 (+0000)
Subject: - allow firebird header to be in the normal deps directory and restore firebird suppo... 
X-Git-Tag: php-5.4.0alpha1~191^2~674
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0af01dc7a56ec4ac25a8c947c6ca9f57c8e81422;p=php

- allow firebird header to be in the normal deps directory and restore firebird support on win (5.3.4+)
---

diff --git a/ext/interbase/config.w32 b/ext/interbase/config.w32
index 78a442d8ca..5512125463 100644
--- a/ext/interbase/config.w32
+++ b/ext/interbase/config.w32
@@ -5,7 +5,8 @@ ARG_WITH("interbase", "InterBase support", "no");
 
 if (PHP_INTERBASE != "no") {
 
-	if (CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_INTERBASE", PHP_PHP_BUILD + "\\interbase\\include;" + PHP_INTERBASE) &&
+	if (CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_INTERBASE", 
+				PHP_PHP_BUILD + "\\include\\interbase;" + PHP_PHP_BUILD + "\\interbase\\include;" + PHP_INTERBASE) &&
 			(CHECK_LIB("fbclient_ms.lib", "interbase", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_INTERBASE) ||
 			 CHECK_LIB("gds32_ms.lib", "interbase", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_INTERBASE))) {
 
diff --git a/ext/pdo_firebird/config.w32 b/ext/pdo_firebird/config.w32
index b28a89e2ea..9cf5ac1337 100644
--- a/ext/pdo_firebird/config.w32
+++ b/ext/pdo_firebird/config.w32
@@ -7,7 +7,9 @@ if (PHP_PDO_FIREBIRD != "no") {
 
 	if ((CHECK_LIB("fbclient_ms.lib", "pdo_firebird", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_PDO_FIREBIRD)
 			|| CHECK_LIB("gds32_ms.lib", "pdo_firebird", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_PDO_FIREBIRD)
-		) && CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_PDO_FIREBIRD", PHP_PHP_BUILD + "\\interbase\\include;" + PHP_PDO_FIREBIRD)) {
+		) && CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_PDO_FIREBIRD", 
+				PHP_PHP_BUILD + "\\include\\interbase;" + PHP_PHP_BUILD + "\\interbase\\include;" + PHP_PDO_FIREBIRD)
+		) {
 
 		EXTENSION("pdo_firebird", "pdo_firebird.c firebird_driver.c firebird_statement.c");
 	} else {