Test for Interbase version 6 API in 'configure'

# Always enable in Win32 for the time being

diff --git a/ext/interbase/config.m4 b/ext/interbase/config.m4
index ac4dd1e66480fce7826d2e787fce18e17487d8f9..6af08a7a8fc587290d58127b57abc4e3dacb74a7 100644 (file)
--- a/ext/interbase/config.m4
+++ b/ext/interbase/config.m4
@@ -37,6 +37,16 @@ if test "$PHP_INTERBASE" != "no"; then
   ], [
     -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)

diff --git a/ext/interbase/config.w32 b/ext/interbase/config.w32
index 5fa0e3ccdc1e4f24cffc4e9e1b8ecb4818fc3425..95f9069dff479c3d1bcc706940ea2dd93dee18ec 100644 (file)
--- a/ext/interbase/config.w32
+++ b/ext/interbase/config.w32
@@ -10,6 +10,7 @@ if (PHP_INTERBASE != "no") {
                         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");
        }