PATCH: Fix intl issues on FreeBSD

[Renato Botelho]

Hello,

Here is a patch that fixed build on FreeBSD when LINGUAS is not set

diff --git a/src/misc.c b/src/misc.c
index a7de66b..7790edb 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 a900193..4464a4f 100644
--- a/util/wmgenmenu.c
+++ b/util/wmgenmenu.c
@@ -1,11 +1,11 @@
 /* Copyright (C) 2010 Carlos R. Mafra */

+#include "../src/wconfig.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <locale.h>
-#include <libintl.h>
-#define _(text) gettext(text)

 #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");


Thanks
-- 
Renato Botelho

wmaker.patch
Description: Binary data