generate dblib and mssql variants in the same build

diff --git a/ext/pdo_dblib/config.w32 b/ext/pdo_dblib/config.w32
index 2afa731dfd6aebb7b56d4c75123b67fabecc5abc..422360f20aecd1b8498a13abdff650d88290e19b 100755 (executable)
--- a/ext/pdo_dblib/config.w32
+++ b/ext/pdo_dblib/config.w32
@@ -1,36 +1,53 @@
 // $Id$
 // vim:ft=javascript
 
-ARG_WITH("pdo-dblib", "dblib (Sybase, MSSQL) support for PDO", "no");
+ARG_WITH("pdo-dblib", "freetds dblib (Sybase, MS-SQL) support for PDO", "no");
 
 if (PHP_PDO_DBLIB != "no") {
        /* if they pointed us to a freetds dir, pick that up,
         * otherwise we'll poke around and look for MSSQL libs */
 
        if (CHECK_LIB("sybdb.lib", "pdo_dblib", PHP_PDO_DBLIB) &&
-                       CHECK_HEADER_ADD_INCLUDE("sybfront.h", "CFLAGS_PDO_DBLIB", PHP_PDO_DBLIB)) {
+                       CHECK_HEADER_ADD_INCLUDE("sybfront.h", "CFLAGS_PDO_DBLIB",
+                               PHP_PDO_DBLIB, null, null, true))
+       {
+               EXTENSION("pdo_dblib", "pdo_dblib.c dblib_driver.c dblib_stmt.c");
+               ADD_FLAG('CFLAGS_PDO_DBLIB', "/I pecl /I ..\\pecl /D PDO_DBLIB_FLAVOUR=\\\"freetds\\\"");
+       }
+       ADD_EXTENSION_DEP('pdo_dblib', 'pdo');
+}
+
+ARG_WITH("pdo-mssql", "Native MS-SQL support for PDO", "no");
+
+if (PHP_PDO_MSSQL != "no") {
+       /* if they pointed us to a freetds dir, pick that up,
+        * otherwise we'll poke around and look for MSSQL libs */
+
+       if (CHECK_LIB("sybdb.lib", "pdo_mssql", PHP_PDO_MSSQL) &&
+                       CHECK_HEADER_ADD_INCLUDE("sybfront.h", "CFLAGS_PDO_MSSQL",
+                       PHP_PDO_MSSQL, null, null, true)) {
                /* smells like FreeTDS (or maybe native sybase dblib) */
                PDO_DBLIB_FLAVOUR = "freetds";
-       } else if (CHECK_LIB("ntwdblib.lib", "pdo_dblib", "\\MSSQL8\\DevTools\\Lib") &&
-                       CHECK_HEADER_ADD_INCLUDE("sqlfront.h", "CFLAGS_PDO_DBLIB")) {
+       } else if (CHECK_LIB("ntwdblib.lib", "pdo_mssql", "\\MSSQL8\\DevTools\\Lib") &&
+                       CHECK_HEADER_ADD_INCLUDE("sqlfront.h", "CFLAGS_PDO_MSSQL",
+                       null, null, null, true)) {
                PDO_DBLIB_FLAVOUR = 8;
-       } else if (CHECK_LIB("ntwdblib.lib", "pdo_dblib", "\\MSSQL7\\DevTools\\Lib") &&
-                       CHECK_HEADER_ADD_INCLUDE("sqlfront.h", "CFLAGS_PDO_DBLIB")) {
+       } else if (CHECK_LIB("ntwdblib.lib", "pdo_mssql", "\\MSSQL7\\DevTools\\Lib") &&
+                       CHECK_HEADER_ADD_INCLUDE("sqlfront.h", "CFLAGS_PDO_MSSQL",
+                       null, null, null, true)) {
                PDO_DBLIB_FLAVOUR = 7;
        } else {
                PDO_DBLIB_FLAVOUR = 0;
        }
 
        if (PDO_DBLIB_FLAVOUR != 0) {
-               EXTENSION("pdo_dblib", "pdo_dblib.c dblib_driver.c dblib_stmt.c", null, "", 
-                       PDO_DBLIB_FLAVOUR == "freetds" ? "php_pdo_sybase.dll" : "php_pdo_mssql.dll");
+               EXTENSION("pdo_mssql", "pdo_dblib.c dblib_driver.c dblib_stmt.c", null, null, null, "ext\\pdo_mssql");
                if (PDO_DBLIB_FLAVOUR != "freetds") {
-                       ADD_FLAG("CFLAGS_PDO_DBLIB", "/DPHP_DBLIB_IS_MSSQL=1 /DDBNTWIN32=1 /DMSSQL" + PDO_DBLIB_FLAVOUR + "0=1 /DMSSQL_VERSION=\\\"" + PDO_DBLIB_FLAVOUR + ".0\\\"");
-                       AC_DEFINE("PDO_DBLIB_IS_MSSQL", PDO_DBLIB_FLAVOUR, "Have MSSQL support");
+                       ADD_FLAG("CFLAGS_PDO_MSSQL", "/DPHP_DBLIB_IS_MSSQL=1 /DDBNTWIN32=1 /DMSSQL" + PDO_DBLIB_FLAVOUR + "0=1 /DMSSQL_VERSION=\\\"" + PDO_DBLIB_FLAVOUR + ".0\\\"");
+                       ADD_FLAG("CFLAGS_PDO_MSSQL", "/DPDO_DBLIB_IS_MSSQL=" + PDO_DBLIB_FLAVOUR);
                        PDO_DBLIB_FLAVOUR = "MSSQL_" + PDO_DBLIB_FLAVOUR;
                }
-               ADD_FLAG('CFLAGS_PDO_DBLIB', "/I pecl /I ..\\pecl /D PDO_DBLIB_FLAVOUR=\\\"" + PDO_DBLIB_FLAVOUR + "\\\"");
+               ADD_FLAG('CFLAGS_PDO_MSSQL', "/I pecl /I ..\\pecl /D PDO_DBLIB_FLAVOUR=\\\"" + PDO_DBLIB_FLAVOUR + "\\\"");
        }
-       ADD_EXTENSION_DEP('pdo_dblib', 'pdo');
+       ADD_EXTENSION_DEP('pdo_mssql', 'pdo');
 }
-