Index: scconfig/Makefile
===================================================================
--- scconfig/Makefile	(revision 2316)
+++ scconfig/Makefile	(revision 2317)
@@ -81,5 +81,5 @@
 cquote: cquote.c
 
 clean:
-	rm $(OBJS) configure
+	rm $(OBJS) $(DEFAULT_MAIN_OBJS) configure
 
Index: scconfig/hooks.c
===================================================================
--- scconfig/hooks.c	(revision 2316)
+++ scconfig/hooks.c	(revision 2317)
@@ -13,6 +13,8 @@
 
 #include "plugin_3state.h"
 
+int want_intl = 0;
+
 const arg_auto_set_t disable_libs[] = { /* list of --disable-LIBs and the subtree they affect */
 	{"disable-xrender",   "libs/gui/xrender",             arg_lib_nodes, "$do not use xrender for lesstif"},
 	{"disable-xinerama",  "libs/gui/xinerama",            arg_lib_nodes, "$do not use xinerama for lesstif"},
@@ -62,6 +64,10 @@
 		put("/local/pcb/debug", strue);
 		return 1;
 	}
+	if ((strcmp(key, "with-intl") == 0) || (strcmp(key, "enable-intl") == 0)) {
+		want_intl = 1;
+		return 1;
+	}
 	else if (strcmp(key, "help") == 0) {
 		help1();
 		arg_auto_print_options(stdout, " ", "                         ", disable_libs);
@@ -136,6 +142,14 @@
 	require("cc/fpic",  0, 1);
 	require("fstools/mkdir", 0, 1);
 
+	if (want_intl) {
+		require("libs/sul/gettext/presents", 0, 0);
+		if (!istrue(get("libs/sul/gettext/presents"))) {
+			report_repeat("\nERROR: intl support explicitly requested but gettext is not found on your system.\n\n");
+			return 1;
+		}
+	}
+
 	if (want_stroke) {
 		require("libs/gui/libstroke/presents", 0, 0);
 		if (!istrue(get("libs/gui/libstroke/presents"))) {