From: Ard Biesheuvel <abies@php.net>
Date: Sun, 25 Jan 2004 12:03:24 +0000 (+0000)
Subject: Check for both Firebird 1+ and Interbase/FB1
X-Git-Tag: php_ibase_before_split~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb7aca4ea896b09cb9afc2466a46f4720acc4a4e;p=php

Check for both Firebird 1+ and Interbase/FB1
---

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");
 	}
 }
-