Merge pull request #64 from mlazdans/master

Handle Firebird 4/5 types

Author: MartinKoeditz

.gitignore

@@ -58,6 +58,7 @@ yaml.loT
 .FBCIndex
 .FBCLockFolder
 core
+*.dep
 
 # Test specific Ignores
 tests/*.diff

config.m4

@@ -54,6 +54,22 @@ if test "$PHP_INTERBASE" != "no"; then
   fi
 
   AC_DEFINE(HAVE_IBASE,1,[ ])
-  PHP_NEW_EXTENSION(interbase, interbase.c ibase_query.c ibase_service.c ibase_events.c ibase_blobs.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
+  PHP_NEW_EXTENSION(interbase, interbase.c ibase_query.c ibase_service.c ibase_events.c ibase_blobs.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1,[cxx])
   PHP_SUBST(INTERBASE_SHARED_LIBADD)
+
+  PHP_REQUIRE_CXX()
+  PHP_CXX_COMPILE_STDCXX([11], [mandatory], [PHP_INTERBASE_STDCXX])
+
+  PHP_INTERBASE_CXX_SOURCES="pdo_firebird_utils.cpp"
+
+  AS_VAR_IF([ext_shared], [no],
+    [PHP_ADD_SOURCES([$ext_dir],
+      [$PHP_INTERBASE_CXX_SOURCES],
+      [$PHP_INTERBASE_STDCXX])],
+    [PHP_ADD_SOURCES_X([$ext_dir],
+      [$PHP_INTERBASE_CXX_SOURCES],
+      [$PHP_INTERBASE_STDCXX],
+      [shared_objects_interbase],
+      [yes])])
+
 fi

config.w32

@@ -3,13 +3,13 @@
 ARG_WITH("interbase", "InterBase support", "no");
 
 if (PHP_INTERBASE != "no") {
-
-	if (CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_INTERBASE",
-				PHP_PHP_BUILD + "\\include\\interbase;" + PHP_PHP_BUILD + "\\interbase\\include;" + 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 ibase_query.c ibase_service.c ibase_events.c ibase_blobs.c", PHP_INTERBASE_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
+	if (
+		CHECK_HEADER_ADD_INCLUDE("ibase.h", "CFLAGS_INTERBASE", PHP_INTERBASE + "\\include") && (
+			CHECK_LIB("fbclient_ms.lib", "interbase", PHP_INTERBASE + "\\lib") ||
+			CHECK_LIB("gds32_ms.lib", "interbase", PHP_INTERBASE + "\\lib")
+		)
+	) {
+		EXTENSION("interbase", "interbase.c ibase_query.c ibase_service.c ibase_events.c ibase_blobs.c pdo_firebird_utils.cpp", PHP_INTERBASE_SHARED, "/DZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
 		AC_DEFINE('HAVE_IBASE', 1, 'Have interbase library');
 	} else {
 		WARNING("interbase not enabled; libraries and headers not found");