Check for both Firebird 1+ and Interbase/FB1

diff --git a/ext/interbase/config.w32 b/ext/interbase/config.w32
index f01b9716746f4e1aff56512cdb19cccf9aad7937..33c231f87bccd16794ed3c9a32f60f7f0d555d71 100644 (file)
--- 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");
        }
 }
-