clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kalle Sommer Nielsen 2009-05-19 10:22:25 +00:00
parent 45b2586666
commit a58bd002d6
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ext/pdo_dblib/config.w32
View File

@ -13,8 +13,10 @@ if (PHP_PDO_DBLIB != "no") {
{ {
EXTENSION("pdo_dblib", "pdo_dblib.c dblib_driver.c dblib_stmt.c"); EXTENSION("pdo_dblib", "pdo_dblib.c dblib_driver.c dblib_stmt.c");
ADD_FLAG('CFLAGS_PDO_DBLIB', "/D PDO_DBLIB_FLAVOUR=\\\"freetds\\\""); 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"); 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; PDO_DBLIB_FLAVOUR = "MSSQL_" + PDO_DBLIB_FLAVOUR;
} }
ADD_FLAG('CFLAGS_PDO_MSSQL', "/D PDO_DBLIB_FLAVOUR=\\\"" + 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');
} }

4
ext/pdo_dblib/pdo_dblib.c
View File

@ -46,7 +46,11 @@ static const zend_module_dep pdo_dblib_deps[] = {
}; };
#endif #endif
#if PDO_DBLIB_IS_MSSQL
zend_module_entry pdo_mssql_module_entry = {
#else
zend_module_entry pdo_dblib_module_entry = { zend_module_entry pdo_dblib_module_entry = {
#endif
#if ZEND_MODULE_API_NO >= 20050922 #if ZEND_MODULE_API_NO >= 20050922
STANDARD_MODULE_HEADER_EX, NULL, STANDARD_MODULE_HEADER_EX, NULL,
pdo_dblib_deps, pdo_dblib_deps,

6
ext/pdo_dblib/php_pdo_dblib.h
View File

@ -22,9 +22,13 @@
#ifndef PHP_PDO_DBLIB_H #ifndef PHP_PDO_DBLIB_H
#define 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; extern zend_module_entry pdo_dblib_module_entry;
#define phpext_pdo_dblib_ptr &pdo_dblib_module_entry #define phpext_pdo_dblib_ptr &pdo_dblib_module_entry
#endif
#ifdef ZTS #ifdef ZTS
# include "TSRM.h" # include "TSRM.h"