Rename php_freetds.dll to php_dblib.dll (still using the freetds libs).

Allow the build of both versions in the same process

diff --git a/ext/mssql/config.w32 b/ext/mssql/config.w32
index 05ee45e9c7de4aff3a03cfa7cbf482ab4fec55bf..bd1f68669b89de0f2a8a7b2e8ccfaa27beb3eb06 100644 (file)
--- a/ext/mssql/config.w32
+++ b/ext/mssql/config.w32
@@ -3,27 +3,26 @@
 
 ARG_WITH("mssql", "mssql support", "no");
 
-if (PHP_MSSQL == "yes") {
-       if (CHECK_LIB("ntwdblib.lib", "mssql", "\\MSSQL7\\DevTools\\Lib") &&
-                       CHECK_HEADER_ADD_INCLUDE("sqlfront.h", "CFLAGS_MSSQL")) {
+if (PHP_MSSQL != "no") {
+       if (CHECK_LIB("ntwdblib.lib", "mssql", "\\MSSQL7\\DevTools\\Lib;\\MSSQL7\\DevTools\\Lib;" + PHP_MSSQL) &&
+                       CHECK_HEADER_ADD_INCLUDE("sqlfront.h", "CFLAGS_MSSQL", "\\MSSQL7\\DevTools\\Include;\\MSSQL7\\DevTools\\Include" + PHP_MSSQL)) {
                EXTENSION("mssql", "php_mssql.c");
-               ADD_FLAG("CFLAGS_MSSQL", "/D DBNTWIN32=1 /D MSSQL70=1");
                AC_DEFINE('HAVE_MSSQL', 1, 'Have MSSQL support');
+               ADD_FLAG("CFLAGS_MSSQL", "/D DBNTWIN32=1 /D MSSQL70=1");
        } else {
                WARNING("mssql not enabled; libraries and headers not found");
        }
 }
 
-ARG_WITH("freetds", "mssql support with freetds", "no");
+ARG_WITH("dblib", "mssql support with freetds", "no");
 
-if (PHP_FREETDS == "yes") {
-       if (CHECK_LIB("dblib.lib", "freetds", PHP_PHP_BUILD + "\\freetds") &&
-                       CHECK_HEADER_ADD_INCLUDE("sybfront.h", "CFLAGS_FREETDS", PHP_PHP_BUILD + "\\freetds;" + PHP_FREETDS)) {
-               EXTENSION("freetds", "php_mssql.c");
-               ADD_FLAG("CFLAGS_FREETDS", "/D DBNTWIN32=1 /D MSSQL70=1");
-               AC_DEFINE('HAVE_FREETDS', 1, 'Have MSSQL support');
-               ADD_FLAG("CFLAGS_FREETDS", "/D HAVE_MSSQL /D MSSQL_EXPORTS /D COMPILE_DL_MSSQL");
+if (PHP_DBLIB != "no") {
+       if (CHECK_LIB("dblib.lib", "dblib", PHP_PHP_BUILD + "\\freetds") &&
+                       CHECK_HEADER_ADD_INCLUDE("sybfront.h", "CFLAGS_DBLIB", PHP_PHP_BUILD + "\\freetds;" + PHP_DBLIB)) {
+               EXTENSION("dblib", "php_mssql.c", null, null, null, "ext\\dblib");
+               AC_DEFINE('HAVE_MSSQL', 1, 'Have MSSQL support');
+               ADD_FLAG("CFLAGS_DBLIB", "/D HAVE_FREETDS=1 /D DBNTWIN32=1 /D MSSQL70=1 /D MSSQL_EXPORTS /D COMPILE_DL_MSSQL");
        } else {
-               WARNING("freetds not enabled; libraries and headers not found");
+               WARNING("dblib not enabled; libraries and headers not found");
        }
 }