summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArd Biesheuvel <abies@php.net>2004-01-25 12:03:24 +0000
committerArd Biesheuvel <abies@php.net>2004-01-25 12:03:24 +0000
commiteb7aca4ea896b09cb9afc2466a46f4720acc4a4e (patch)
tree6308b82f2252edb202ef6c800c1c24087e92e0ff
parenta2380e901b72620541f15d7364484cc0c88d2e36 (diff)
downloadphp-git-eb7aca4ea896b09cb9afc2466a46f4720acc4a4e.tar.gz
Check for both Firebird 1+ and Interbase/FB1
-rw-r--r--ext/interbase/config.w325
1 files changed, 2 insertions, 3 deletions
diff --git a/ext/interbase/config.w32 b/ext/interbase/config.w32
index f01b971674..33c231f87b 100644
--- a/ext/interbase/config.w32
+++ b/ext/interbase/config.w32
@@ -6,12 +6,11 @@ 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) &&
- CHECK_LIB("ib_util_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("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))) {
EXTENSION("interbase", "interbase.c");
AC_DEFINE('HAVE_IBASE', 1, 'Have interbase library');
} else {
WARNING("interbase not enabled; libraries and headers not found");
}
}
-