[Xfce4-commits] <postler:master> Insert #if HAVE_NLS to make --disable-nls work

[Christian Dywan]

Updating branch refs/heads/master
         to cfb870982928d2418d46167f17f37380f4818c77 (commit)
       from d8738312e0ceb2c17b6c4b1b6f8ed3ae45b0dd36 (commit)

commit cfb870982928d2418d46167f17f37380f4818c77
Author: Christian Dywan <christian at twotoasts.de>
Date:   Tue Feb 22 22:40:01 2011 +0100

    Insert #if HAVE_NLS to make --disable-nls work

 postler/postler-reader.vala |    2 ++
 wscript                     |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/postler/postler-reader.vala b/postler/postler-reader.vala
index 280e864..bd7038b 100644
--- a/postler/postler-reader.vala
+++ b/postler/postler-reader.vala
@@ -25,9 +25,11 @@ public class Postler.Reader {
     static int main (string[] args) {
         Postler.App.argv0 = args[0];
 
+#if HAVE_NLS
         Intl.bindtextdomain (Config.GETTEXT_PACKAGE, Config.LOCALEDIR);
         Intl.bind_textdomain_codeset (Config.GETTEXT_PACKAGE, "UTF-8");
         Intl.textdomain (Config.GETTEXT_PACKAGE);
+#endif
 
         var context = new GLib.OptionContext (
             /* i18n: The meaning of the uppercase values is analogous to the
diff --git a/wscript b/wscript
index bbc2bb9..9e6f595 100644
--- a/wscript
+++ b/wscript
@@ -83,12 +83,12 @@ def configure (conf):
         conf.check_tool ('intltool')
         if conf.env['INTLTOOL'] and conf.env['POCOM']:
             nls = 'yes'
+            conf.env.append_value ('VALAFLAGS', '-D HAVE_NLS')
         else:
             option_checkfatal ('nls', 'localization')
             nls = 'N/A'
     else:
         nls = 'no '
-    conf.define ('ENABLE_NLS', [0,1][nls == 'yes'])
 
     def check_pkg (name, version='', mandatory=True, var=None, args=''):
         if not var: