cvs: php-src /ext/interbase config.m4 config.w32
| From: | Ard Biesheuvel | Date: | Sun, 01 Feb 2004 17:42:26 +0000 |
| Subject: | cvs: php-src /ext/interbase config.m4 config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-25963@lists.php.net to get a copy of this message | ||
abies Sun Feb 1 12:42:26 2004 EDT
Modified files:
/php-src/ext/interbase config.m4 config.w32
Log:
Test for Interbase version 6 API in 'configure'
# Always enable in Win32 for the time being
http://cvs.php.net/diff.php/php-src/ext/interbase/config.m4?r1=1.16&r2=1.17&ty=u
Index: php-src/ext/interbase/config.m4
diff -u php-src/ext/interbase/config.m4:1.16 php-src/ext/interbase/config.m4:1.17
--- php-src/ext/interbase/config.m4:1.16 Sun Feb 1 11:13:05 2004
+++ php-src/ext/interbase/config.m4 Sun Feb 1 12:42:26 2004
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.16 2004/02/01 16:13:05 abies Exp $
+dnl $Id: config.m4,v 1.17 2004/02/01 17:42:26 abies Exp $
dnl
PHP_ARG_WITH(interbase,for InterBase support,
@@ -37,6 +37,16 @@
], [
-L$IBASE_LIBDIR
])
+
+ if test " $IBASE_LIBNAME" != " "; then
+ PHP_CHECK_LIBRARY($IBASE_LIBNAME, isc_service_attach,
+ [
+ AC_DEFINE(HAVE_IBASE6_API,1,[ ])
+ AC_MSG_RESULT([Interbase version 6 API has been enabled.])
+ ], [
+ AC_MSG_RESULT([Interbase version 6 API has NOT been enabled.])
+ ], [ ])
+ fi
PHP_ADD_LIBRARY_WITH_PATH($IBASE_LIBNAME, $IBASE_LIBDIR, INTERBASE_SHARED_LIBADD)
PHP_ADD_INCLUDE($IBASE_INCDIR)
http://cvs.php.net/diff.php/php-src/ext/interbase/config.w32?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/interbase/config.w32
diff -u php-src/ext/interbase/config.w32:1.3 php-src/ext/interbase/config.w32:1.4
--- php-src/ext/interbase/config.w32:1.3 Sun Feb 1 11:13:06 2004
+++ php-src/ext/interbase/config.w32 Sun Feb 1 12:42:26 2004
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.3 2004/02/01 16:13:06 abies Exp $
+// $Id: config.w32,v 1.4 2004/02/01 17:42:26 abies Exp $
// vim:ft=javascript
ARG_WITH("interbase", "InterBase support", "no");
@@ -10,6 +10,7 @@
CHECK_LIB("gds32_ms.lib", "interbase", PHP_PHP_BUILD +
"\\interbase\\lib_ms;" + PHP_INTERBASE))) {
EXTENSION("interbase", "interbase.c ibase_service.c ibase_events.c
ibase_blobs.c");
AC_DEFINE('HAVE_IBASE', 1, 'Have interbase library');
+ AC_DEFINE('HAVE_IBASE6_API', 1, 'Have interbase version 6 API library');
} else {
WARNING("interbase not enabled; libraries and headers not found");
}