MFH: Fix --with-pdo-mssql build and add some warnings if header/libs are not found

diff --git a/ext/pdo_dblib/config.w32 b/ext/pdo_dblib/config.w32
index 7ab90af0c13ed1e9c4b00a6684ffc612a5510d4c..14cbb68f1ad6cb48a74b502c06a71c10b71c2988 100755 (executable)
--- a/ext/pdo_dblib/config.w32
+++ b/ext/pdo_dblib/config.w32
@@ -13,8 +13,10 @@ if (PHP_PDO_DBLIB != "no") {
        {
                EXTENSION("pdo_dblib", "pdo_dblib.c dblib_driver.c dblib_stmt.c");
                ADD_FLAG('CFLAGS_PDO_DBLIB', "/D PDO_DBLIB_FLAVOUR=\\\"freetds\\\"");
+               ADD_EXTENSION_DEP('pdo_dblib', 'pdo');
+       } else {
+               WARNING("pdo_dblib not enabled, libraries or headers not found")
        }
-       ADD_EXTENSION_DEP('pdo_dblib', 'pdo');
 }
 
 ARG_WITH("pdo-mssql", "Native MS-SQL support for PDO", "no");
@@ -64,6 +66,8 @@ if (PHP_PDO_MSSQL != "no") {
                        PDO_DBLIB_FLAVOUR = "MSSQL_" + PDO_DBLIB_FLAVOUR;
                }
                ADD_FLAG('CFLAGS_PDO_MSSQL', "/D PDO_DBLIB_FLAVOUR=\\\"" + PDO_DBLIB_FLAVOUR + "\\\"");
+               ADD_EXTENSION_DEP('pdo_mssql', 'pdo');
+       } else {
+               WARNING("pdo_mssql not enabled, libraries or headers not found")
        }
-       ADD_EXTENSION_DEP('pdo_mssql', 'pdo');
 }

diff --git a/ext/pdo_dblib/pdo_dblib.c b/ext/pdo_dblib/pdo_dblib.c
index dd1371cb7872f89bd770c782b847bf0be1bf3866..9e1d7112e78947162697c6a6e790cd96a4d1afe3 100644 (file)
--- a/ext/pdo_dblib/pdo_dblib.c
+++ b/ext/pdo_dblib/pdo_dblib.c
@@ -46,7 +46,11 @@ static zend_module_dep pdo_dblib_deps[] = {
 };
 #endif
 
+#if PDO_DBLIB_IS_MSSQL
+zend_module_entry pdo_mssql_module_entry = {
+#else
 zend_module_entry pdo_dblib_module_entry = {
+#endif
 #if ZEND_MODULE_API_NO >= 20050922
        STANDARD_MODULE_HEADER_EX, NULL,
        pdo_dblib_deps,

diff --git a/ext/pdo_dblib/php_pdo_dblib.h b/ext/pdo_dblib/php_pdo_dblib.h
index 0bde8fe6e724c5712b45c9da1ebb4e12caa288bd..48a624367448cd1c3d9fde52b70ef28337dc671f 100644 (file)
--- a/ext/pdo_dblib/php_pdo_dblib.h
+++ b/ext/pdo_dblib/php_pdo_dblib.h
@@ -22,9 +22,13 @@
 #ifndef PHP_PDO_DBLIB_H
 #define PHP_PDO_DBLIB_H
 
-
+#if PDO_DBLIB_IS_MSSQL
+extern zend_module_entry pdo_mssql_module_entry;
+#define phpext_pdo_mssql_ptr &pdo_mssql_module_entry
+#else
 extern zend_module_entry pdo_dblib_module_entry;
 #define phpext_pdo_dblib_ptr &pdo_dblib_module_entry
+#endif
 
 #ifdef PHP_WIN32
 # define PHP_PDO_DBLIB_API __declspec(dllexport)