pajoye Sun, 14 Nov 2010 22:40:30 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=305343
Log:
- allow firebird header to be in the normal deps directory and restore firebird
support on win (5.3.4+)
Changed paths:
U php/php-src/branches/PHP_5_3/ext/interbase/config.w32
U php/php-src/branches/PHP_5_3/ext/pdo_firebird/config.w32
U php/php-src/trunk/ext/interbase/config.w32
U php/php-src/trunk/ext/pdo_firebird/config.w32
Modified: php/php-src/branches/PHP_5_3/ext/interbase/config.w32
===================================================================
--- php/php-src/branches/PHP_5_3/ext/interbase/config.w32 2010-11-14
22:22:07 UTC (rev 305342)
+++ php/php-src/branches/PHP_5_3/ext/interbase/config.w32 2010-11-14
22:40:30 UTC (rev 305343)
@@ -5,7 +5,8 @@
if (PHP_INTERBASE != "no") {
- if (CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_INTERBASE",
PHP_PHP_BUILD + "\\interbase\\include;" + PHP_INTERBASE) &&
+ if (CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_INTERBASE",
+ PHP_PHP_BUILD + "\\include\\interbase;" +
PHP_PHP_BUILD + "\\interbase\\include;" + PHP_INTERBASE) &&
(CHECK_LIB("fbclient_ms.lib", "interbase",
PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_INTERBASE) ||
CHECK_LIB("gds32_ms.lib", "interbase", PHP_PHP_BUILD +
"\\interbase\\lib_ms;" + PHP_INTERBASE))) {
Modified: php/php-src/branches/PHP_5_3/ext/pdo_firebird/config.w32
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_firebird/config.w32 2010-11-14
22:22:07 UTC (rev 305342)
+++ php/php-src/branches/PHP_5_3/ext/pdo_firebird/config.w32 2010-11-14
22:40:30 UTC (rev 305343)
@@ -7,7 +7,9 @@
if ((CHECK_LIB("fbclient_ms.lib", "pdo_firebird", PHP_PHP_BUILD +
"\\interbase\\lib_ms;" + PHP_PDO_FIREBIRD)
|| CHECK_LIB("gds32_ms.lib", "pdo_firebird",
PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_PDO_FIREBIRD)
- ) && CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_PDO_FIREBIRD",
PHP_PHP_BUILD + "\\interbase\\include;" + PHP_PDO_FIREBIRD)) {
+ ) && CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_PDO_FIREBIRD",
+ PHP_PHP_BUILD + "\\include\\interbase;" +
PHP_PHP_BUILD + "\\interbase\\include;" + PHP_PDO_FIREBIRD)
+ ) {
EXTENSION("pdo_firebird", "pdo_firebird.c firebird_driver.c
firebird_statement.c");
} else {
Modified: php/php-src/trunk/ext/interbase/config.w32
===================================================================
--- php/php-src/trunk/ext/interbase/config.w32 2010-11-14 22:22:07 UTC (rev
305342)
+++ php/php-src/trunk/ext/interbase/config.w32 2010-11-14 22:40:30 UTC (rev
305343)
@@ -5,7 +5,8 @@
if (PHP_INTERBASE != "no") {
- if (CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_INTERBASE",
PHP_PHP_BUILD + "\\interbase\\include;" + PHP_INTERBASE) &&
+ if (CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_INTERBASE",
+ PHP_PHP_BUILD + "\\include\\interbase;" +
PHP_PHP_BUILD + "\\interbase\\include;" + PHP_INTERBASE) &&
(CHECK_LIB("fbclient_ms.lib", "interbase",
PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_INTERBASE) ||
CHECK_LIB("gds32_ms.lib", "interbase", PHP_PHP_BUILD +
"\\interbase\\lib_ms;" + PHP_INTERBASE))) {
Modified: php/php-src/trunk/ext/pdo_firebird/config.w32
===================================================================
--- php/php-src/trunk/ext/pdo_firebird/config.w32 2010-11-14 22:22:07 UTC
(rev 305342)
+++ php/php-src/trunk/ext/pdo_firebird/config.w32 2010-11-14 22:40:30 UTC
(rev 305343)
@@ -7,7 +7,9 @@
if ((CHECK_LIB("fbclient_ms.lib", "pdo_firebird", PHP_PHP_BUILD +
"\\interbase\\lib_ms;" + PHP_PDO_FIREBIRD)
|| CHECK_LIB("gds32_ms.lib", "pdo_firebird",
PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_PDO_FIREBIRD)
- ) && CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_PDO_FIREBIRD",
PHP_PHP_BUILD + "\\interbase\\include;" + PHP_PDO_FIREBIRD)) {
+ ) && CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_PDO_FIREBIRD",
+ PHP_PHP_BUILD + "\\include\\interbase;" +
PHP_PHP_BUILD + "\\interbase\\include;" + PHP_PDO_FIREBIRD)
+ ) {
EXTENSION("pdo_firebird", "pdo_firebird.c firebird_driver.c
firebird_statement.c");
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
