Merge pull request phpredis#917 from TysonAndre/add-igbinary-to-include-path-in-windows

yatsukhnenko · web-flow · commit 8a0ecbc162f7 · 2016-11-08T08:26:52.000+02:00
php7 - Properly add igbinary to the include path in windows
diff --git a/config.w32 b/config.w32
@@ -13,7 +13,9 @@ if (PHP_REDIS != "no") {
 	}
 
 	if (PHP_REDIS_IGBINARY != "no") {
-		if (CHECK_HEADER_ADD_INCLUDE("igbinary.h", "CFLAGS_REDIS", configure_module_dirname + "\\..\\igbinary")) {
+		// If igbinary/igbinary.h is found in the pecl dir,
+		// then add the pecl dir to the list of directories to search for headers. (Makes #include "igbinary/igbinary.h" work)
+		if (CHECK_HEADER_ADD_INCLUDE("igbinary/igbinary.h", "CFLAGS_REDIS", configure_module_dirname + "\\..")) {
 
 			ADD_EXTENSION_DEP("redis", "igbinary");
 			AC_DEFINE("HAVE_REDIS_IGBINARY", 1);

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,9 @@ if (PHP_REDIS != "no") {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`if (PHP_REDIS_IGBINARY != "no") {`
`16`		`- if (CHECK_HEADER_ADD_INCLUDE("igbinary.h", "CFLAGS_REDIS", configure_module_dirname + "\\..\\igbinary")) {`
	`16`	`+ // If igbinary/igbinary.h is found in the pecl dir,`
	`17`	`+ // then add the pecl dir to the list of directories to search for headers. (Makes #include "igbinary/igbinary.h" work)`
	`18`	`+ if (CHECK_HEADER_ADD_INCLUDE("igbinary/igbinary.h", "CFLAGS_REDIS", configure_module_dirname + "\\..")) {`
`17`	`19`
`18`	`20`	`ADD_EXTENSION_DEP("redis", "igbinary");`
`19`	`21`	`AC_DEFINE("HAVE_REDIS_IGBINARY", 1);`