mirror of
https://github.com/php/php-src.git
synced 2024-11-24 18:34:21 +08:00
- allow firebird header to be in the normal deps directory and restore firebird support on win (5.3.4+)
This commit is contained in:
parent
69ba9c82af
commit
0af01dc7a5
@ -5,7 +5,8 @@ ARG_WITH("interbase", "InterBase support", "no");
|
|||||||
|
|
||||||
if (PHP_INTERBASE != "no") {
|
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("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))) {
|
CHECK_LIB("gds32_ms.lib", "interbase", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_INTERBASE))) {
|
||||||
|
|
||||||
|
@ -7,7 +7,9 @@ if (PHP_PDO_FIREBIRD != "no") {
|
|||||||
|
|
||||||
if ((CHECK_LIB("fbclient_ms.lib", "pdo_firebird", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_PDO_FIREBIRD)
|
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_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");
|
EXTENSION("pdo_firebird", "pdo_firebird.c firebird_driver.c firebird_statement.c");
|
||||||
} else {
|
} else {
|
||||||
|
Loading…
Reference in New Issue
Block a user