From 0f5c36a67e680c4fcb98f40b72d4e5a0e69fc2b4 Mon Sep 17 00:00:00 2001
From: Renato Botelho <rbgarga@gmail.com>
Date: Wed, 24 Mar 2010 11:14:38 -0300
Subject: [PATCH] Fix non-I18N build

* Remove directly include of <libintl.h> and include src/wconfig.h, that
already include libintl.h and declare _() function
* Replace some gettext() calls to _()

These changes fixes build with LINGUAS is unset, and removes I18N
support in this case.
---
 src/misc.c       | 9 ++++-----
 util/wmgenmenu.c | 6 ++++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/misc.c b/src/misc.c
index a7de66b1..7790edb9 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -32,7 +32,6 @@
 #include <pwd.h>
 #include <math.h>
 #include <time.h>
-#include <libintl.h>
 
 #include <WINGs/WUtil.h>
 #include <wraster.h>
@@ -561,13 +560,13 @@ getuserinput(WScreen *scr, char *line, int *ptr, Bool advanced)
 
     if(advanced)
         rv = wAdvancedInputDialog(scr,
-		title ? gettext(title):_("Program Arguments"),
-		prompt ? gettext(prompt):_("Enter command arguments:"),
+		title ? _(title):_("Program Arguments"),
+		prompt ? _(prompt):_("Enter command arguments:"),
 		name, &ret);
     else
         rv = wInputDialog(scr,
-		title ? gettext(title):_("Program Arguments"),
-		prompt ? gettext(prompt):_("Enter command arguments:"),
+		title ? _(title):_("Program Arguments"),
+		prompt ? _(prompt):_("Enter command arguments:"),
 		&ret);
 
     if(title) wfree(title);
diff --git a/util/wmgenmenu.c b/util/wmgenmenu.c
index a9001936..d2da56e0 100644
--- a/util/wmgenmenu.c
+++ b/util/wmgenmenu.c
@@ -4,8 +4,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <locale.h>
-#include <libintl.h>
-#define _(text) gettext(text)
+
+#include "../src/wconfig.h"
 
 #include <WINGs/WUtil.h>
 
@@ -33,6 +33,7 @@ int main(int argc, char *argv[])
 	locale = getenv("LANG");
 	setlocale(LC_ALL, "");
 
+#if HAVE_LIBINTL_H && I18N
 	if (getenv("NLSPATH"))
 		bindtextdomain("wmgenmenu", getenv("NLSPATH"));
 	else
@@ -40,6 +41,7 @@ int main(int argc, char *argv[])
 
 	bind_textdomain_codeset("wmgenmenu", "UTF-8");
 	textdomain("wmgenmenu");
+#endif
 
 	printf("\(\"Window Maker\",\n");