diff --git a/config.w32 b/config.w32 index 76d4ee3c..00da033a 100644 --- a/config.w32 +++ b/config.w32 @@ -32,14 +32,14 @@ if (PHP_MEMCACHED == "yes") { if (PHP_MEMCACHED_IGBINARY != "no"){ AC_DEFINE("HAVE_MEMCACHED_IGBINARY",1); ADD_EXTENSION_DEP("memcached", "igbinary", true); - if (!CHECK_HEADER_ADD_INCLUDE("igbinary.h", "CFLAGS_MEMCACHED")) { + if (!CHECK_HEADER_ADD_INCLUDE("igbinary.h", "CFLAGS_MEMCACHED", configure_module_dirname + "\\..\\igbinary")) { ERROR("memcached: header 'igbinary.h' not found"); } } if (PHP_MEMCACHED_MSGPACK != "no"){ AC_DEFINE("HAVE_MEMCACHED_MSGPACK",1); ADD_EXTENSION_DEP("memcached", "msgpack", true); - if (!CHECK_HEADER_ADD_INCLUDE("php_msgpack.h", "CFLAGS_MEMCACHED")) { + if (!CHECK_HEADER_ADD_INCLUDE("php_msgpack.h", "CFLAGS_MEMCACHED", configure_module_dirname + "\\..\\msgpack")) { ERROR("memcached: header 'php_msgpack.h' not found"); } } diff --git a/php_memcached.c b/php_memcached.c index b78eb82a..9d5acd36 100644 --- a/php_memcached.c +++ b/php_memcached.c @@ -49,14 +49,14 @@ #ifdef PHP_WIN32 //Windows extensions are generally built together, //so it wont be in the installed location -#include "igbinary.h" +#include "igbinary/igbinary.h" #else -# include "ext/igbinary/igbinary.h" +# include "igbinary/igbinary.h" #endif #endif #ifdef HAVE_MEMCACHED_MSGPACK -# include "ext/msgpack/php_msgpack.h" +# include "msgpack/php_msgpack.h" #endif # include "ext/spl/spl_exceptions.h"