From: Wez Furlong <wez@php.net>
Date: Mon, 22 Dec 2003 22:41:59 +0000 (+0000)
Subject: Allow FrontBase to build against my local version of the headers
X-Git-Tag: php_ibase_before_split~527
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d163ec27af2b1b4da4f12c28b9964ed65fa84446;p=php

Allow FrontBase to build against my local version of the headers
---

diff --git a/ext/fbsql/config.w32 b/ext/fbsql/config.w32
index e4c9c5175c..0c6909ab52 100644
--- a/ext/fbsql/config.w32
+++ b/ext/fbsql/config.w32
@@ -4,10 +4,14 @@
 ARG_WITH("fbsql", "FrontBase support", "no");
 
 if (PHP_FBSQL == "yes") {
-	if (CHECK_LIB("FBCAccess.lib", "fbsql", "\\usr\\FrontBase\\lib") &&
-			CHECK_HEADER_ADD_INCLUDE("FBCAccess\\FBCAccess.h", "CFLAGS", "\\usr\\FrontBase\\include")) {
+	if (CHECK_LIB("FBCAccess.lib", "fbsql",
+		   	"\\usr\\FrontBase\\lib;" + PHP_PHP_BUILD + "\\FrontBase\\lib;"
+		   	+ PHP_FBSQL + "\\lib;" + PHP_FBSQL) &&
+			CHECK_HEADER_ADD_INCLUDE("FBCAccess\\FBCAccess.h", "CFLAGS_FBSQL",
+		   	"\\usr\\FrontBase\\include;" + PHP_PHP_BUILD + "\\FrontBase\\include;"
+			+ PHP_FBSQL + "\\include;" + PHP_FBSQL)) {
 		EXTENSION("fbsql", "php_fbsql.c");
-		AC_DEFINE('WinNT', 1, '');
+		ADD_FLAG('CFLAGS_FBSQL', '/DWinNT=1');
 		AC_DEFINE('HAVE_FBSQL', 1, 'Have FrontBase support');
 	} else {
 		WARNING("fbsql not enabled; libraries and headers not found");