abies Sun Jan 25 07:03:25 2004 EDT
Modified files:
/php-src/ext/interbase config.w32
Log:
Check for both Firebird 1+ and Interbase/FB1
http://cvs.php.net/diff.php/php-src/ext/interbase/config.w32?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/interbase/config.w32
diff -u php-src/ext/interbase/config.w32:1.1 php-src/ext/interbase/config.w32:1.2
--- php-src/ext/interbase/config.w32:1.1 Fri Dec 19 10:04:20 2003
+++ php-src/ext/interbase/config.w32 Sun Jan 25 07:03:24 2004
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.1 2003/12/19 15:04:20 wez Exp $
+// $Id: config.w32,v 1.2 2004/01/25 12:03:24 abies Exp $
// vim:ft=javascript
ARG_WITH("interbase", "InterBase support", "no");
@@ -6,12 +6,11 @@
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");
}
}
-
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
