[niepce: 12/14] [cw][mg] tweak gettext for Magellan and Camerawire apps

[Hubert Figuière <hub src gnome org>]

commit c6122bf3d8c55591086b356b592375a7fc3257d4
Author: Hubert Figuière <hub figuiere net>
Date:   Sat Jun 8 14:01:29 2013 -0400

    [cw][mg] tweak gettext for Magellan and Camerawire apps

 camerawire/src/main.cpp |    8 +++-----
 configure.ac            |   12 ++++++------
 magellan/src/main.cpp   |    6 +++---
 3 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/camerawire/src/main.cpp b/camerawire/src/main.cpp
index d10b2d3..08ed008 100644
--- a/camerawire/src/main.cpp
+++ b/camerawire/src/main.cpp
@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-#include <boost/bind.hpp>
-
 #include <glibmm/i18n.h>
 
 #include "fwk/utils/init.hpp"
@@ -31,9 +29,9 @@
 
 int main(int argc, char ** argv)
 {
-  bindtextdomain(GETTEXT_PACKAGE, CW_LOCALEDIR);
-  bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
-  textdomain(GETTEXT_PACKAGE);
+  bindtextdomain(CW_GETTEXT_PACKAGE, CW_LOCALEDIR);
+  bind_textdomain_codeset(CW_GETTEXT_PACKAGE, "UTF-8");
+  textdomain(CW_GETTEXT_PACKAGE);
 
   fwk::utils::init();
 
diff --git a/configure.ac b/configure.ac
index c1f6a75..3c3c08c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,9 +225,9 @@ MICRO_VERSION=1
 CAMERAWIRE_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION"
 AC_SUBST(CAMERAWIRE_VERSION)
 
-GETTEXT_PACKAGE=camerawire
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"],
+CW_GETTEXT_PACKAGE=camerawire
+AC_SUBST(CW_GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED([CW_GETTEXT_PACKAGE], ["$CW_GETTEXT_PACKAGE"],
                    [The domain to use with gettext])
 AM_GLIB_GNU_GETTEXT
 
@@ -258,9 +258,9 @@ MICRO_VERSION=1
 MG_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION"
 AC_SUBST(MG_VERSION)
 
-GETTEXT_PACKAGE=magellan
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"],
+MG_GETTEXT_PACKAGE=magellan
+AC_SUBST(MG_GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED([MG_GETTEXT_PACKAGE], ["$MG_GETTEXT_PACKAGE"],
                    [The domain to use with gettext])
 AM_GLIB_GNU_GETTEXT
 
diff --git a/magellan/src/main.cpp b/magellan/src/main.cpp
index 8432a18..99b9566 100644
--- a/magellan/src/main.cpp
+++ b/magellan/src/main.cpp
@@ -31,9 +31,9 @@
 
 int main(int argc, char ** argv)
 {
-  bindtextdomain(GETTEXT_PACKAGE, CW_LOCALEDIR);
-  bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
-  textdomain(GETTEXT_PACKAGE);
+  bindtextdomain(MG_GETTEXT_PACKAGE, MG_LOCALEDIR);
+  bind_textdomain_codeset(MG_GETTEXT_PACKAGE, "UTF-8");
+  textdomain(MG_GETTEXT_PACKAGE);
 
   fwk::utils::init();