scheme=malloc was broken in [465]

git-svn-id: svn://svn.lighttpd.net/xcache/branches/1.2@479 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

config.m4

@@ -43,9 +43,6 @@ if test "$PHP_XCACHE" != "no"; then
   XCACHE_OPTION([decoder],      [decoder     ], [XCACHE_DECODER],      [(N/A)])
   AC_DEFINE_UNQUOTED([XCACHE_MODULES], "$XCACHE_MODULES", [Define what modules is built with XCache])
 
-  PHP_NEW_EXTENSION(xcache, $xcache_sources, $ext_shared)
-  PHP_ADD_MAKEFILE_FRAGMENT()
-
   PHP_ARG_ENABLE(xcache-test, for XCache self test,
   [  --enable-xcache-test            XCache: Enable self test - FOR DEVELOPERS ONLY!!], no, no)
   if test "$PHP_XCACHE_TEST" != "no"; then
@@ -63,6 +60,9 @@ if test "$PHP_XCACHE" != "no"; then
     AC_DEFINE([HAVE_XCACHE_DPRINT], 1, [Define to enable XCache debug print functions])
   fi
 
+  PHP_NEW_EXTENSION(xcache, $xcache_sources, $ext_shared)
+  PHP_ADD_MAKEFILE_FRAGMENT()
+
   AC_PATH_PROGS([XCACHE_AWK], [gawk awk])
   dnl clean locale for gawk 3.1.5 assertion bug
   if echo | LANG=C "$XCACHE_AWK" -- '' > /dev/null 2>&1 ; then

config.w32

@@ -70,6 +70,23 @@ if (PHP_XCACHE != "no") {
 	}
 	DEFINE("XCACHE_INDENT", indent);
 	// }}}
+	// {{{ check for xcache-test
+	ARG_ENABLE("xcache-test", "XCache: Enable self test - FOR DEVELOPERS ONLY!!", "no");
+	if (PHP_XCACHE_TEST != "no") {
+		ADD_FLAG("XCACHE_ENABLE_TEST", "-DXCACHE_ENABLE_TEST");
+		xcache_sources += " xc_malloc.c";
+		AC_DEFINE("HAVE_XCACHE_TEST", 1, "Define to enable XCache self test");
+	}
+	else {
+		ADD_FLAG("XCACHE_ENABLE_TEST", "");
+	}
+	// }}}
+	// {{{ check for xcache-test
+	ARG_ENABLE("xcache-dprint", "XCache: Enable self debug print functions - FOR DEVELOPERS ONLY!!", "no");
+	if (PHP_XCACHE_DPRINT != "no") {
+		AC_DEFINE("HAVE_XCACHE_DPRINT", 1, "Define to enable XCache debug print functions");
+	}
+	// }}}
 	// {{{ create extension
 	EXTENSION("xcache", xcache_sources);
 	var srcdir = configure_module_dirname;
@@ -108,25 +125,8 @@ if (PHP_XCACHE != "no") {
 	MFO.WriteLine(frag);
 	ADD_FLAG("CFLAGS_XCACHE", "/I " + builddir);
 	/// }}}
-	// {{{ check for xcache-test
-	ARG_ENABLE("xcache-test", "XCache: Enable self test - FOR DEVELOPERS ONLY!!", "no");
-	if (PHP_XCACHE_TEST != "no") {
-		ADD_FLAG("XCACHE_ENABLE_TEST", "-DXCACHE_ENABLE_TEST");
-		xcache_sources += " xc_malloc.c";
-		AC_DEFINE("HAVE_XCACHE_TEST", 1, "Define to enable XCache self test");
-	}
-	else {
-		ADD_FLAG("XCACHE_ENABLE_TEST", "");
-	}
-	// }}}
 	XCACHE_PROC_SOURCES=glob(srcdir + "\\processor\\*.m4").join(' ');
 	ADD_FLAG("XCACHE_PROC_SOURCES", XCACHE_PROC_SOURCES);
-	// {{{ check for xcache-test
-	ARG_ENABLE("xcache-dprint", "XCache: Enable self debug print functions - FOR DEVELOPERS ONLY!!", "no");
-	if (PHP_XCACHE_TEST != "no") {
-		AC_DEFINE("HAVE_XCACHE_TEST", 1, "Define to enable XCache debug print functions");
-	}
-	// }}}
 	// {{{ check for opcode_spec_def.h
 	STDOUT.Write("Checking if you have opcode_spec_def.h for XCache ... ");
 	var file = srcdir + "\\opcode_spec_def.h";

xc_malloc.c

@@ -3,6 +3,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xc_shm.h"
 #include "php.h"
 #include "align.h"

xc_shm.c

@@ -8,6 +8,10 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xc_shm.h"
 
 struct _xc_shm_scheme_t {