diff options
| author | Pierre Joye <pajoye@php.net> | 2010-11-14 22:40:30 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2010-11-14 22:40:30 +0000 |
| commit | 0af01dc7a56ec4ac25a8c947c6ca9f57c8e81422 (patch) | |
| tree | b9347b952b32fd2299119e6af1a8de5d2f93bb45 | |
| parent | 69ba9c82affe1564a5b53f4360cb530d4b845a87 (diff) | |
| download | php-git-0af01dc7a56ec4ac25a8c947c6ca9f57c8e81422.tar.gz | |
- allow firebird header to be in the normal deps directory and restore firebird support on win (5.3.4+)
| -rw-r--r-- | ext/interbase/config.w32 | 3 | ||||
| -rw-r--r-- | ext/pdo_firebird/config.w32 | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ext/interbase/config.w32 b/ext/interbase/config.w32 index 78a442d8ca..5512125463 100644 --- a/ext/interbase/config.w32 +++ b/ext/interbase/config.w32 @@ -5,7 +5,8 @@ ARG_WITH("interbase", "InterBase support", "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("gds32_ms.lib", "interbase", PHP_PHP_BUILD + "\\interbase\\lib_ms;" + PHP_INTERBASE))) { diff --git a/ext/pdo_firebird/config.w32 b/ext/pdo_firebird/config.w32 index b28a89e2ea..9cf5ac1337 100644 --- a/ext/pdo_firebird/config.w32 +++ b/ext/pdo_firebird/config.w32 @@ -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) || 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 { |