diff --git a/lib/modules/Tools.pmod/Install.pmod b/lib/modules/Tools.pmod/Install.pmod index cc3fa8942d968ed4308b7a37d7b00ac4142c85e6..968a3f3fba4606223dbcd7fa6c14153d27010f9c 100644 --- a/lib/modules/Tools.pmod/Install.pmod +++ b/lib/modules/Tools.pmod/Install.pmod @@ -48,19 +48,17 @@ array(string) features() a += ({ "profiling" }); #endif -#if constant (Java.machine) - a += ({"Java"}); -#if constant (Java.NATIVE_METHODS) - a += ({"Java.NATIVE_METHODS"}); -#endif -#endif - +#if 0 + // No use reporting stuff that always exists. This list is for + // things that might not be compiled in due to configure options, + // missing libs, etc. /mast m += ({ "PostgresNative" }); +#endif foreach(({ "Nettle", "Dbm", "DVB", "_Ffmpeg", "GL", "GLUT", "GTK", "Gdbm", "Gmp", "Gz", "_Image_FreeType", "_Image_GIF", "_Image_JPEG", "_Image_TIFF", "_Image_TTF", "_Image_XFace", "Image.PNG", - "Mird", "Msql", "Mysql", "Odbc", "Oracle", + "Java.machine", "Mird", "Msql", "Mysql", "Odbc", "Oracle", "PDF.PDFlib", "Perl", "Postgres", "SANE", "SDL", "Ssleay", "Yp", "sybase", "_WhiteFish", "X", "Bz2", "COM", "Fuse", "GTK2", "Gettext", "HTTPAccept", @@ -75,12 +73,12 @@ array(string) features() { if(modname[0] == '_') modname = replace(modname[1..], "_", "."); - m += ({ modname }); + m += ({ (["Java.machine":"Java"])[modname] || modname }); } }; } - foreach (({"Regexp.PCRE.Widestring"}), string symbol) + foreach (({"Regexp.PCRE.Widestring", "Java.NATIVE_METHODS"}), string symbol) catch { if (!zero_type(all_constants()[symbol]) || !zero_type(master()->resolv(symbol)))