Allow FrontBase to build against my local version of the headers

diff --git a/ext/fbsql/config.w32 b/ext/fbsql/config.w32
index e4c9c5175c0fe354734903f96d673e0efc92b8e2..0c6909ab529489d504f9afabc70f97b3e77e9bcc 100644 (file)
--- 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");