From 86dd9ef4203d4231b1b470775b96a29c97cb8a7d Mon Sep 17 00:00:00 2001 From: Hadis Kakanejadi Fard Date: Mon, 9 Jan 2017 15:10:04 -0800 Subject: [PATCH] updated sqlsrv and pdo_sqlsrv config.w32 to get the dir name dynamically --- source/pdo_sqlsrv/config.w32 | 34 +++++++++++++++++----------------- source/sqlsrv/config.w32 | 31 +++++++++++++++++-------------- 2 files changed, 34 insertions(+), 31 deletions(-) diff --git a/source/pdo_sqlsrv/config.w32 b/source/pdo_sqlsrv/config.w32 index 523e98cc..021491d4 100644 --- a/source/pdo_sqlsrv/config.w32 +++ b/source/pdo_sqlsrv/config.w32 @@ -21,23 +21,23 @@ ARG_WITH("pdo-sqlsrv", "enable Microsoft Drivers for PHP for SQL Server (PDO dri if( PHP_PDO_SQLSRV != "no" ) { - pdo_sqlsrv_src_class = "pdo_dbh.cpp pdo_init.cpp pdo_stmt.cpp pdo_util.cpp pdo_parser.cpp "; - shared_src_class = "shared\core_init.cpp shared\core_conn.cpp shared\core_stmt.cpp shared\core_util.cpp shared\core_stream.cpp shared\core_results.cpp" + pdo_sqlsrv_src_class = " pdo_dbh.cpp pdo_init.cpp pdo_stmt.cpp pdo_util.cpp pdo_parser.cpp "; + shared_src_class = " core_init.cpp core_conn.cpp core_stmt.cpp core_util.cpp core_stream.cpp core_results.cpp "; if (CHECK_LIB("odbc32.lib", "pdo_sqlsrv") && CHECK_LIB("odbccp32.lib", "pdo_sqlsrv") && - CHECK_LIB("version.lib", "pdo_sqlsrv") && CHECK_LIB("psapi.lib", "pdo_sqlsrv")) { - - EXTENSION("pdo_sqlsrv", pdo_sqlsrv_src_clas shared_src_class, PHP_PDO_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1") - - CHECK_HEADER_ADD_INCLUDE( 'core_sqlsrv.h',CFLAGS_PDO_SQLSRV, PHP_PDO_SQLSRV_SHARED, "ext\\pdo_sqlsrv\\shared" ) - CHECK_HEADER_ADD_INCLUDE('sql.h', 'CFLAGS_PDO_SQLSRV_ODBC'); - CHECK_HEADER_ADD_INCLUDE('sqlext.h', 'CFLAGS_PDO_SQLSRV_ODBC'); - ADD_FLAG( 'LDFLAGS_PDO_SQLSRV', '/NXCOMPAT /DYNAMICBASE /debug' ); - ADD_FLAG( 'CFLAGS_PDO_SQLSRV', '/EHsc' ); - ADD_FLAG( 'CFLAGS_PDO_SQLSRV', '/GS' ); - ADD_FLAG( 'CFLAGS_PDO_SQLSRV', '/Zi' ); - ADD_FLAG( 'CFLAGS_PDO_SQLSRV', '/D ZEND_WIN32_FORCE_INLINE' ); - ADD_EXTENSION_DEP('pdo_sqlsrv', 'pdo'); - } - + CHECK_LIB("version.lib", "pdo_sqlsrv") && CHECK_LIB("psapi.lib", "pdo_sqlsrv")&& + CHECK_HEADER_ADD_INCLUDE( "core_sqlsrv.h", "CFLAGS_PDO_SQLSRV", configure_module_dirname + "\\shared")) { + CHECK_HEADER_ADD_INCLUDE("sql.h", "CFLAGS_PDO_SQLSRV_ODBC"); + CHECK_HEADER_ADD_INCLUDE("sqlext.h", "CFLAGS_PDO_SQLSRV_ODBC"); + ADD_SOURCES( configure_module_dirname + "\\shared", shared_src_class, "pdo_sqlsrv" ); + ADD_FLAG( "LDFLAGS_PDO_SQLSRV", "/NXCOMPAT /DYNAMICBASE /debug" ); + ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/EHsc" ); + ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/GS" ); + ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/Zi" ); + ADD_FLAG( "CFLAGS_PDO_SQLSRV", "/D ZEND_WIN32_FORCE_INLINE" ); + ADD_EXTENSION_DEP('pdo_sqlsrv', 'pdo'); + EXTENSION("pdo_sqlsrv", pdo_sqlsrv_src_class, PHP_PDO_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); + } else { + WARNING("pdo-sqlsrv not enabled; libraries and headers not found"); + } } diff --git a/source/sqlsrv/config.w32 b/source/sqlsrv/config.w32 index b9f41f07..e9d201ff 100644 --- a/source/sqlsrv/config.w32 +++ b/source/sqlsrv/config.w32 @@ -3,7 +3,7 @@ // // Contents: JScript build configuration used by buildconf.bat // -// Microsoft Drivers 4.0 for PHP for SQL Server +// Microsoft Drivers 4.1 for PHP for SQL Server // Copyright(c) Microsoft Corporation // All rights reserved. // MIT License @@ -21,19 +21,22 @@ ARG_ENABLE("sqlsrv", "enable Microsoft Drivers for PHP for SQL Server (SQLSRV dr if( PHP_SQLSRV != "no" ) { - sqlsrv_src = "conn.cpp init.cpp stmt.cpp util.cpp core_init.cpp core_conn.cpp core_stmt.cpp core_util.cpp core_stream.cpp core_results.cpp"; + sqlsrv_src_class = " conn.cpp init.cpp stmt.cpp util.cpp "; + shared_src_class = " core_init.cpp core_conn.cpp core_stmt.cpp core_util.cpp core_stream.cpp core_results.cpp "; if (CHECK_LIB("odbc32.lib", "sqlsrv") && CHECK_LIB("odbccp32.lib", "sqlsrv") && - CHECK_LIB("version.lib", "sqlsrv") && CHECK_LIB("psapi.lib", "sqlsrv")) { - - EXTENSION("sqlsrv", sqlsrv_src, PHP_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1") - - CHECK_HEADER_ADD_INCLUDE('sql.h', 'CFLAGS_SQLSRV_ODBC'); - CHECK_HEADER_ADD_INCLUDE('sqlext.h', 'CFLAGS_SQLSRV_ODBC'); - ADD_FLAG( 'LDFLAGS_SQLSRV', '/NXCOMPAT /DYNAMICBASE /debug' ); - ADD_FLAG( 'CFLAGS_SQLSRV', '/D ZEND_WIN32_FORCE_INLINE' ); - ADD_FLAG( 'CFLAGS_SQLSRV', '/EHsc' ); - ADD_FLAG( 'CFLAGS_SQLSRV', '/GS' ); - ADD_FLAG( 'CFLAGS_SQLSRV', '/Zi' ); - } + CHECK_LIB("version.lib", "sqlsrv") && CHECK_LIB("psapi.lib", "sqlsrv")&& + CHECK_HEADER_ADD_INCLUDE( "core_sqlsrv.h", "CFLAGS_SQLSRV", configure_module_dirname + "\\shared")) { + ADD_SOURCES( configure_module_dirname + "\\shared", shared_src_class, "sqlsrv" ); + CHECK_HEADER_ADD_INCLUDE("sql.h", "CFLAGS_SQLSRV_ODBC"); + CHECK_HEADER_ADD_INCLUDE("sqlext.h", "CFLAGS_SQLSRV_ODBC"); + ADD_FLAG( "LDFLAGS_SQLSRV", "/NXCOMPAT /DYNAMICBASE /debug" ); + ADD_FLAG( "CFLAGS_SQLSRV", "/D ZEND_WIN32_FORCE_INLINE" ); + ADD_FLAG( "CFLAGS_SQLSRV", "/EHsc" ); + ADD_FLAG( "CFLAGS_SQLSRV", "/GS" ); + ADD_FLAG( "CFLAGS_SQLSRV", "/Zi" ); + EXTENSION("sqlsrv", sqlsrv_src_class , PHP_SQLSRV_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"); + } else { + WARNING("sqlsrv not enabled; libraries and headers not found"); + } }