Merge branch 'hotfix/win32-fixes' into develop

Conflicts:
	redis.c

Author: michael-grunder

CREDITS

@@ -1,5 +1,5 @@
 Redis client extension for PHP
-Alfonso Jimenez <[email protected]>
-Nasreddine Bouafif <[email protected]>
-Nicolas Favre-Felix <[email protected]>
-Michael Grunder <[email protected]>
+Alfonso Jimenez ([email protected])
+Nasreddine Bouafif ([email protected])
+Nicolas Favre-Felix ([email protected])
+Michael Grunder ([email protected])

config.h

@@ -1,15 +1,28 @@
-// vim: ft=javascript:
-
-ARG_ENABLE("redis", "whether to enable redis support", "yes");
-ARG_ENABLE("redis-session", "whether to enable sessions", "yes");
-
-if (PHP_REDIS != "no") {
-	var sources = "redis.c library.c igbinary\\igbinary.c igbinary\\hash_si.c igbinary\\hash_function.c";
-	if (PHP_REDIS_SESSION != "no") {
-		AC_DEFINE('PHP_SESSION', 1);
-		sources += " redis_session.c";
-	}
-	
-	AC_DEFINE("PHP_EXPORTS", 1);
-	EXTENSION("redis", sources);
-}
+// vim: ft=javascript:
+
+ARG_ENABLE("redis", "whether to enable redis support", "yes");
+ARG_ENABLE("redis-session", "whether to enable sessions", "yes");
+ARG_ENABLE("redis-igbinary", "whether to enable igbinary serializer support", "no");
+
+if (PHP_REDIS != "no") {
+	var sources = "redis.c library.c redis_array.c redis_array_impl.c";
+	if (PHP_REDIS_SESSION != "no") {
+		ADD_SOURCES(configure_module_dirname, "redis_session.c", "redis");
+		ADD_EXTENSION_DEP("redis", "session");
+		ADD_FLAG("CFLAGS_REDIS", ' /D PHP_SESSION=1 ');
+		AC_DEFINE("HAVE_REDIS_SESSION", 1);
+	}
+
+	if (PHP_REDIS_IGBINARY != "no") {
+		if (CHECK_HEADER_ADD_INCLUDE("igbinary.h", "CFLAGS_REDIS", configure_module_dirname + "\\..\\igbinary")) {
+
+			ADD_EXTENSION_DEP("redis", "igbinary");
+			AC_DEFINE("HAVE_REDIS_IGBINARY", 1);
+		} else {
+			WARNING("redis igbinary support not enabled");
+		}
+	}
+
+	EXTENSION("redis", sources);
+}
+