Index: trunk/doc/TODO
===================================================================
--- trunk/doc/TODO	(revision 36605)
+++ trunk/doc/TODO	(revision 36606)
@@ -14,8 +14,6 @@
 	+ merge sch-rnd r4212 [report: Alain]
 	- librnd 3.2.0+: use lib_exp_* and lib_imp_*
 		- export_ps, export_svg
-		- (remove gd stuff from config.h.in)
-		- (remove gd detection from scconfig)
 		- remove export_lpr/lpr_hid.[ch] in favor of librnd's
 	- librnd 3.2.0+: export dialog
 		- remove dialogs/dlg_export, make the old ExportGUI and PrintGUI call librnd's ExportDialog and PrintDialog
Index: trunk/scconfig/Rev.h
===================================================================
--- trunk/scconfig/Rev.h	(revision 36605)
+++ trunk/scconfig/Rev.h	(revision 36606)
@@ -1 +1 @@
-static const int myrev = 36604;
+static const int myrev = 36606;
Index: trunk/scconfig/Rev.tab
===================================================================
--- trunk/scconfig/Rev.tab	(revision 36605)
+++ trunk/scconfig/Rev.tab	(revision 36606)
@@ -1,4 +1,4 @@
-36604	configure	remove export png code in favor of librnd's
+36606	configure	remove export png code in favor of librnd's
 36602	configure	remove local pixmap support in favor of librnd's
 36562	configure	font engine rewrite
 36322	configure	generalize export_lpr so it can be moved to librnd
Index: trunk/scconfig/hooks.c
===================================================================
--- trunk/scconfig/hooks.c	(revision 36605)
+++ trunk/scconfig/hooks.c	(revision 36606)
@@ -31,9 +31,6 @@
 
 const arg_auto_set_t disable_libs[] = { /* list of --disable-LIBs and the subtree they affect */
 	{"disable-gd",        "libs/gui/gd",                  arg_lib_nodes, "$do not use gd (many exporters need it)"},
-	{"disable-gd-gif",    "libs/gui/gd/gdImageGif",       arg_lib_nodes, "$no gif support in the png rnd_exporter"},
-	{"disable-gd-png",    "libs/gui/gd/gdImagePng",       arg_lib_nodes, "$no png support in the png rnd_exporter"},
-	{"disable-gd-jpg",    "libs/gui/gd/gdImageJpeg",      arg_lib_nodes, "$no jpeg support in the png rnd_exporter"},
 	{"enable-bison",      "/local/pcb/want_bison",        arg_true,      "$enable generating language files using bison/flex"},
 	{"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"},
@@ -225,29 +222,12 @@
 		require("libs/gui/gd/presents", 0, 0);
 		if (!istrue(get("libs/gui/gd/presents"))) {
 			report_repeat("WARNING: Since there's no libgd, disabling gd based exports and pixmap imports (png, gif, jpeg)...\n");
-			hook_custom_arg("disable-gd-gif", NULL);
-			hook_custom_arg("disable-gd-png", NULL);
-			hook_custom_arg("disable-gd-jpg", NULL);
 			hook_custom_arg("disable-export_png", NULL);
 			want_gd = 0;
-			goto disable_gd_formats;
 		}
-		else {
-			require("libs/gui/gd/gdImagePng/presents", 0, 0);
-			require("libs/gui/gd/gdImageGif/presents", 0, 0);
-			require("libs/gui/gd/gdImageJpeg/presents", 0, 0);
-			require("libs/gui/gd/gdImageSetResolution/presents", 0, 0);
-			if (!istrue(get("libs/gui/gd/gdImagePng/presents"))) {
-				report_repeat("WARNING: libgd is installed, but its png code fails, some exporters will be compiled with reduced functionality\n");
-			}
-		}
 	}
 	else {
 		put("libs/gui/gd/presents", sfalse);
-		disable_gd_formats:;
-		put("libs/gui/gd/gdImagePng/presents", sfalse);
-		put("libs/gui/gd/gdImageGif/presents", sfalse);
-		put("libs/gui/gd/gdImageJpeg/presents", sfalse);
 	}
 
 	/* yacc/lex - are we able to regenerate languages? */