Index: trunk/config.h.in =================================================================== --- trunk/config.h.in (revision 20383) +++ trunk/config.h.in (revision 20384) @@ -109,9 +109,6 @@ print {\n\n/* Define to 1 if Xrender is available */\n} print_ternary ?libs/gui/xrender/presents {#define HAVE_XRENDER 1} {/*#undef HAVE_XRENDER */} -print {\n\n/* Define to 1 if translation of program messages to the user's native language is requested. */\n} -print_ternary ?/local/pcb/want_nls {#define ENABLE_NLS 1} {/*#undef ENABLE_NLS */} - print {\n\n/* Define to 1 if we should use windows api for dynamic linking. */\n} print_ternary ?libs/LoadLibrary/presents {#define USE_LOADLIBRARY 1} {/* #undef USE_LOADLIBRARY */} Index: trunk/scconfig/hooks.c =================================================================== --- trunk/scconfig/hooks.c (revision 20383) +++ trunk/scconfig/hooks.c (revision 20384) @@ -17,7 +17,7 @@ #include "../src_3rd/puplug/scconfig_hooks.h" #include "../src_3rd/libfungw/scconfig_hooks.h" -int want_intl = 0, want_coord_bits; +int want_coord_bits; 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"}, @@ -150,7 +150,7 @@ return 1; } if ((strcmp(key, "with-intl") == 0) || (strcmp(key, "enable-intl") == 0)) { - want_intl = 1; + report("ERROR: --with-intl is no longer supported, please do not use it\n"); return 1; } else if (strcmp(key, "help") == 0) { @@ -443,17 +443,6 @@ return 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; - } - put("/local/pcb/want_nls", strue); - } - else - put("/local/pcb/want_nls", sfalse); - if (want_stroke) { require("libs/gui/libstroke/presents", 0, 0); if (!istrue(get("libs/gui/libstroke/presents"))) { @@ -919,7 +908,6 @@ printf("=====================\n"); print_sum_setting("/local/pcb/want_parsgen", "Regenerating languages with bison & flex"); - print_sum_setting("/local/pcb/want_nls", "Internationalization with gettext"); 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");