Index: Rev.h
===================================================================
--- Rev.h	(revision 38522)
+++ Rev.h	(revision 38523)
@@ -1 +1 @@
-static const int myrev = 38522;
+static const int myrev = 38523;
Index: Rev.tab
===================================================================
--- Rev.tab	(revision 38522)
+++ Rev.tab	(revision 38523)
@@ -1,4 +1,4 @@
-38522	configure	require librnd >=4.1.0
+38523	configure	require librnd >=4.1.0 and enable font2
 38351	configure	font mode: preview dialog
 38025	configure	export_bom2: new bom plugin with templates
 37808	configure	gsch2pcb-rnd removal
Index: hooks.c
===================================================================
--- hooks.c	(revision 38522)
+++ hooks.c	(revision 38523)
@@ -37,8 +37,6 @@
 	{"disable-byaccic",   "/local/pcb/want_byaccic",      arg_false,     "$disable generating language files byaccic/ureglex"},
 	{"enable-polybool",   "/local/pcb/want_polybool",     arg_true,      "$enable the new polygon clipping library"},
 	{"disable-polybool",  "/local/pcb/want_polybool",     arg_false,     "$disable the new polygon clipping library"},
-	{"enable-font2",      "/local/pcb/want_font2",        arg_true,      "$enable the new font library in librnd; temporary; requires librnd >=4.1.0"},
-	{"disable-font2",     "/local/pcb/want_font2",        arg_false,     "$disable the new font library in librnd; temporary; requires librnd >=4.1.0"},
 
 #undef plugin_def
 #undef plugin_header
@@ -109,7 +107,6 @@
 	put("/local/pcb/want_byaccic", sfalse);
 	put("/local/pcb/want_static", sfalse);
 	put("/local/pcb/want_polybool", sfalse);
-	put("/local/pcb/want_font2", sfalse);
 	put("/local/pcb/dot_pcb_rnd", ".pcb-rnd");
 	put("/local/pcb/librnd_prefix", TO_STR(LIBRND_PREFIX));
 
@@ -179,10 +176,6 @@
 	}
 }
 
-/* TODO: remove this; for /local/pcb/want_font2 test */
-extern unsigned long librnd_ver_get(int *major, int *minor, int *patch);
-
-
 /* Runs when things should be detected for the target system */
 int hook_detect_target()
 {
@@ -197,15 +190,6 @@
 	if (rnd_hook_detect_sys() != 0)
 		return 1;
 
-	if (istrue(get("/local/pcb/want_font2"))) {
-		int major, minor, patch;
-		librnd_ver_get(&major, &minor, &patch);
-		if ((major < 4) || (minor < 1)) {
-			fprintf(stderr, "configuration error: can't enable font2: requires librnd >=4.1.0\n(You have librnd %d.%d.%d)\n", major, minor, patch);
-			exit(1);
-		}
-	}
-
 	if (want_fuse) {
 		require("libs/sul/fuse/*", 0, 0);
 		if (!istrue(get("libs/sul/fuse/presents"))) {