list modules compiled in XCache

git-svn-id: svn://svn.lighttpd.net/xcache/trunk@26 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

config.m4

@@ -5,6 +5,7 @@ AC_DEFUN([XCACHE_OPTION], [
   [  --enable-xcache-$2    XCache: $4], no, no)
   if test "$PHP_$3" != "no"; then
     xcache_sources="$xcache_sources $1.c"
+    XCACHE_MODULES="$XCACHE_MODULES $1"
     HAVE_$3=1
     AC_DEFINE([HAVE_$3], 1, [Define for XCache: $4])
   else
@@ -26,12 +27,14 @@ if test "$PHP_XCACHE" != "no"; then
                   utils.c \
                   lock.c \
                   "
+  XCACHE_MODULES="cacher"
   XCACHE_OPTION([optimizer],    [optimizer   ], [XCACHE_OPTIMIZER],    [(N/A)])
   XCACHE_OPTION([coverage],     [coverage    ], [XCACHE_COVERAGE],     [Enable code coverage dumper, NOT for production server])
   XCACHE_OPTION([assembler],    [assembler   ], [XCACHE_ASSEMBLER],    [(N/A)])
   XCACHE_OPTION([disassembler], [disassembler], [XCACHE_DISASSEMBLER], [Enable opcode to php variable dumper, NOT for production server])
   XCACHE_OPTION([encoder],      [encoder     ], [XCACHE_ENCODER],      [(N/A)])
   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()

config.w32

@@ -22,6 +22,7 @@ if (PHP_XCACHE != "no") {
 	ARG_ENABLE("xcache-encoder",      "(N/A)", "no");
 	ARG_ENABLE("xcache-decoder",      "(N/A)", "no");
 
+	var XCACHE_MODULES = "cacher";
 	var options = ["optimizer",
 	               "coverage",
 	               "assembler", "disassembler",
@@ -32,10 +33,12 @@ if (PHP_XCACHE != "no") {
 		var withval = eval("PHP_XCACHE_" + uname);
 		if (withval != "no") {
 			xcache_sources += " " + name + ".c";
+			XCACHE_MODULES += " " + name;
 			STDOUT.WriteLine("Enabling XCache Module: " + name);
 			AC_DEFINE("HAVE_XCACHE_" + uname, 1, "Define for XCache: " + name)
 		}
 	}
+	AC_DEFINE("XCACHE_MODULES", XCACHE_MODULES);
 	// }}}
 	// {{{ check for programs needed
 	var apps = ["m4", "grep", "sed"];

xcache.c

@@ -1746,9 +1746,13 @@ static PHP_MINFO_FUNCTION(xcache)
 	php_info_print_table_start();
 	php_info_print_table_header(2, "XCache Support", (xc_php_size || xc_var_size) ? "enabled" : "disabled");
 	php_info_print_table_row(2, "Version", XCACHE_VERSION);
+	php_info_print_table_row(2, "Modules Built", XCACHE_MODULES);
 	php_info_print_table_row(2, "Readonly Protection", xc_readonly_protection ? "enabled" : "N/A");
 	php_info_print_table_row(2, "Opcode Cache", xc_php_size ? "enabled" : "disabled");
 	php_info_print_table_row(2, "Variable Cache", xc_var_size ? "enabled" : "disabled");
+#ifdef HAVE_XCACHE_COVERAGER
+	php_info_print_table_row(2, "Coverage Dumper", XG(coveragedumper) && xc_coveragedump_dir && xc_coveragedump_dir[0] ? "enabled" : "disabled");
+#endif
 	php_info_print_table_end();
 	DISPLAY_INI_ENTRIES();
 }