Index: trunk/scconfig/hooks.c =================================================================== --- trunk/scconfig/hooks.c (revision 30891) +++ trunk/scconfig/hooks.c (revision 30892) @@ -31,8 +31,6 @@ {"disable-bison", "/local/pcb/want_bison", arg_false, "$disable generating language files using bison/flex"}, {"enable-byaccic", "/local/pcb/want_byaccic", arg_true, "$enable generating language files using byaccic/ureglex"}, {"disable-byaccic", "/local/pcb/want_byaccic", arg_false, "$disable generating language files byaccic/ureglex"}, - {"enable-dmalloc", "/local/pcb/want_dmalloc", arg_true, "$compile with lib dmalloc"}, - {"disable-dmalloc", "/local/pcb/want_dmalloc", arg_false, "$compile without lib dmalloc"}, #undef plugin_def #undef plugin_header @@ -223,15 +221,6 @@ put("libs/gui/gd/gdImageJpeg/presents", sfalse); } - if (istrue(get("/local/pcb/want_dmalloc"))) { - require("libs/sul/dmalloc/*", 0, 1); - } - else { - put("libs/sul/dmalloc/presents", sfalse); - put("libs/sul/dmalloc/cflags", ""); - put("libs/sul/dmalloc/ldflags", ""); - } - /* yacc/lex - are we able to regenerate languages? */ if (istrue(get("/local/pcb/want_bison"))) { require("parsgen/flex/*", 0, 0); @@ -355,7 +344,6 @@ print_sum_setting("/local/pcb/want_parsgen", "Regenerating languages with bison & flex"); print_sum_setting("/local/pcb/debug", "Compilation for debugging"); print_sum_setting_or("/local/pcb/symbols", "Include debug symbols", istrue(get("/local/pcb/debug"))); - print_sum_setting("libs/sul/dmalloc/presents", "Compile with dmalloc"); print_sum_cfg_val("/local/pcb/coord_bits", "Coordinate type bits"); print_sum_cfg_val("/local/pcb/dot_pcb_rnd", ".pcb_rnd config dir under $HOME"); Index: trunk/src/Makefile.in =================================================================== --- trunk/src/Makefile.in (revision 30891) +++ trunk/src/Makefile.in (revision 30892) @@ -297,9 +297,6 @@ include {../src_plugins/plugins_ALL.tmpasm} -append /local/pcb/CFLAGS /target/libs/sul/dmalloc/cflags -append /local/pcb/LIBS /target/libs/sul/dmalloc/ldflags - # Lesstif requires that -lXm is before -lXt or else there is a runtime BadWindow error order /local/pcb/LDFLAGS {-lXm} {before} {-lXt} Index: trunk/src/librnd/config.h.in =================================================================== --- trunk/src/librnd/config.h.in (revision 30891) +++ trunk/src/librnd/config.h.in (revision 30892) @@ -192,23 +192,6 @@ the svn revision number (optional) */ #define PCB_API_VER @/local/apiver@ - -/* Define to 1 if you have the `dmalloc' library (-ldmalloc); - (memory debugging without valgrind) */ -@] - -print_ternary libs/sul/dmalloc/presents {#define HAVE_LIBDMALLOC 1} {/*#undef HAVE_LIBDMALLOC */} - -print [@ -/* -The documentation says it's not necessary to include dmalloc.h. -Pros: getting source line info -Cons: can't include from here, needs to be included from the bottom of the #include list from each file -#ifdef HAVE_LIBDMALLOC -#include -#endif -*/ - @?/local/pcb/include_stdint@ /* Coordinate type and properties, as detected by scconfig */