Index: scconfig/hooks.c =================================================================== --- scconfig/hooks.c (revision 1327) +++ scconfig/hooks.c (revision 1328) @@ -34,9 +34,9 @@ {"plugin-gpmi", "/local/pcb/gpmi/buildin", arg_false, "$the gpmi plugin is a dynamic loadable"}, #undef plugin_def -#undef plugin_sep +#undef plugin_header #define plugin_def(name, desc, default_) plugin3_args(name, desc) -#define plugin_sep() +#define plugin_header(sect) #include "plugins.h" {NULL, NULL, NULL, NULL} @@ -98,9 +98,9 @@ put("/local/prefix", "/usr/local"); #undef plugin_def -#undef plugin_sep +#undef plugin_header #define plugin_def(name, desc, default_) plugin3_default(name, default_) -#define plugin_sep() +#define plugin_header(sect) #include "plugins.h" return 0; @@ -303,20 +303,22 @@ return generr; } -static void plugin_stat(const char *header, const char *path) +static void plugin_stat(const char *header, const char *path, const char *name) { const char *val = get(path); - printf("%-32s", header); + printf(" %-32s", header); if (val == NULL) - printf("??? (NULL)\n"); + printf("??? (NULL) "); else if (strcmp(val, sbuildin) == 0) - printf("yes (buildin)\n"); + printf("yes, buildin "); else if (strcmp(val, splugin) == 0) - printf("yes (plugin)\n"); + printf("yes, PLUGIN "); else - printf("no\n"); + printf("no "); + + printf(" [%s]\n", name); } /* Runs after detection hooks, should generate the output (Makefiles, etc.) */ @@ -359,7 +361,7 @@ printf("=====================\n"); printf("Configuration summary\n"); printf("=====================\n\n"); - list_presents("GUI hids: batch", gui_list); + list_presents("GUI hids: batch", gui_list); /* special case because the "presents" node */ printf("%-32s", "Scripting via GPMI: "); @@ -374,9 +376,9 @@ printf("no\n"); #undef plugin_def -#undef plugin_sep +#undef plugin_header #define plugin_def(name, desc, default_) plugin3_stat(name, desc) -#define plugin_sep() printf("\n"); +#define plugin_header(sect) printf(sect); #include "plugins.h" if (repeat != NULL) Index: scconfig/plugin_3state.h =================================================================== --- scconfig/plugin_3state.h (revision 1327) +++ scconfig/plugin_3state.h (revision 1328) @@ -51,4 +51,4 @@ /* plugin_def implementation to print a report with the final state */ #define plugin3_stat(name, desc) \ - plugin_stat(desc, "/local/pcb/" name "/controls"); + plugin_stat(desc, "/local/pcb/" name "/controls", name); Index: scconfig/plugins.h =================================================================== --- scconfig/plugins.h (revision 1327) +++ scconfig/plugins.h (revision 1328) @@ -1,3 +1,4 @@ +plugin_header("\nFeature plugins:\n") plugin_def("autoroute", "the original autorouter", sbuildin) plugin_def("toporouter", "topological autorouter", sdisable) plugin_def("autoplace", "auto place components", sbuildin) @@ -10,10 +11,12 @@ plugin_def("fontmode", "font editor", sbuildin) plugin_def("legacy_func", "legacy functions", sbuildin) plugin_def("stroke", "libstroke gestures", sdisable) -plugin_sep() + +plugin_header("\nImport plugins:\n") plugin_def("import_sch", "import sch", sbuildin) plugin_def("import_edif", "import edif", sbuildin) -plugin_sep() + +plugin_header("\nExport plugins:\n") plugin_def("export_gcode", "gcode exporter", sbuildin) plugin_def("export_nelma", "nelma exporter", sbuildin) plugin_def("export_png", "png/gif/jpg exporter", sbuildin)