Merge remote-tracking branch 'vostok4/master'

Conflicts:
	CREDITS
	README.markdown
	config.w32
	library.c
	library.h
	package.xml
	redis.c
	redis_array.c
	redis_array.h
	redis_array_impl.c
	redis_array_impl.h
	tests/TestRedis.php

Author: weltling

CREDITS

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

config.w32

@@ -1,31 +1,34 @@
-// 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") {
-	EXTENSION("redis", "redis.c library.c redis_array_impl.c redis_array.c");
-	AC_DEFINE("HAVE_REDIS", 1);
-	ADD_FLAG("CFLAGS_REDIS", ' /D PHP_EXPORTS=1 ');
-
-	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");
-		}
-	}
-	
-
-}
-
+// 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");
+		}
+	}
+
+	if (PHP_REDIS_IGBINARY != "no") {
+		CHECK_HEADER_ADD_INCLUDE("igbinary.h", "CFLAGS_REDIS", "ext\\igbinary");
+		AC_DEFINE('HAVE_REDIS_IGBINARY', 1);
+		ADD_EXTENSION_DEP('redis', 'igbinary');
+	}
+
+	EXTENSION("redis", sources);
+}
+