From: Kalle Sommer Nielsen <kalle@php.net>
Date: Tue, 19 May 2009 10:22:31 +0000 (+0000)
Subject: MFH: Fix --with-pdo-mssql build and add some warnings if header/libs are not found
X-Git-Tag: php-5.2.10RC1~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70ebbdea0a92a4a5758b6e18b4a3a67e93ca3ca4;p=php

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 7ab90af0c1..14cbb68f1a 100755
--- 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 dd1371cb78..9e1d7112e7 100644
--- 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 0bde8fe6e7..48a6243674 100644
--- 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)