From 805c200471841a4325845db365c36b6f4af117ad Mon Sep 17 00:00:00 2001
From: Derek Foreman <derek.foreman@collabora.co.uk>
Date: Mon, 16 May 2011 13:52:01 -0400
Subject: [PATCH 1/2] Build on systems without gettext

---
 configure.ac                    |    7 +++++++
 src/mcd-account-compat.c        |    1 -
 src/mcd-account-conditions.c    |    1 -
 src/mcd-account-connection.c    |    1 -
 src/mcd-account-manager-query.c |    1 -
 src/mcd-account-manager.c       |    1 -
 src/mcd-account-requests.c      |    1 -
 src/mcd-account.c               |    1 -
 src/mcd-channel.c               |    2 --
 src/mcd-connection.c            |    1 -
 src/mcd-dispatch-operation.c    |    1 -
 src/mcd-dispatcher.c            |    1 -
 src/mcd-manager.c               |    1 -
 src/mcd-master.c                |    1 -
 src/mcd-mission.c               |    1 -
 src/mcd-operation.c             |    1 -
 src/mcd-proxy.c                 |    1 -
 17 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index 42a2c84..4793980 100644
--- a/configure.ac
+++ b/configure.ac
@@ -310,6 +310,13 @@ if test x"$HAVE_MCE" = xyes; then
   AC_DEFINE([HAVE_MCE], [1], [Define if mce is available])
 fi
 
+AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT([external])
+
+dnl docs/Makefile.am needs to know whether it's an out of tree build
+dnl (srcdir != builddir)
+AM_CONDITIONAL([OUT_OF_TREE_BUILD], [test "z$ac_srcdir" != z.])
+
 # -----------------------------------------------------------
 # Connectivity integration
 # -----------------------------------------------------------
diff --git a/src/mcd-account-compat.c b/src/mcd-account-compat.c
index ab8995f..bb5b8a5 100644
--- a/src/mcd-account-compat.c
+++ b/src/mcd-account-compat.c
@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib/gstdio.h>
-#include <glib/gi18n.h>
 #include <config.h>
 
 #include <dbus/dbus-glib-lowlevel.h>
diff --git a/src/mcd-account-conditions.c b/src/mcd-account-conditions.c
index 223e055..8385efc 100644
--- a/src/mcd-account-conditions.c
+++ b/src/mcd-account-conditions.c
@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib/gstdio.h>
-#include <glib/gi18n.h>
 #include <config.h>
 
 #include <telepathy-glib/svc-generic.h>
diff --git a/src/mcd-account-connection.c b/src/mcd-account-connection.c
index 3d28993..7710d44 100644
--- a/src/mcd-account-connection.c
+++ b/src/mcd-account-connection.c
@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib/gstdio.h>
-#include <glib/gi18n.h>
 #include <config.h>
 
 #include "mcd-master.h"
diff --git a/src/mcd-account-manager-query.c b/src/mcd-account-manager-query.c
index 95e0068..bb331bf 100644
--- a/src/mcd-account-manager-query.c
+++ b/src/mcd-account-manager-query.c
@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib/gstdio.h>
-#include <glib/gi18n.h>
 #include <config.h>
 
 #include <telepathy-glib/svc-generic.h>
diff --git a/src/mcd-account-manager.c b/src/mcd-account-manager.c
index c49a8e7..26acf0c 100644
--- a/src/mcd-account-manager.c
+++ b/src/mcd-account-manager.c
@@ -24,7 +24,6 @@
 
 #include "mcd-account-manager.h"
 
-#include <glib/gi18n.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/mcd-account-requests.c b/src/mcd-account-requests.c
index 82e0e69..da8a1e2 100644
--- a/src/mcd-account-requests.c
+++ b/src/mcd-account-requests.c
@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <glib/gstdio.h>
-#include <glib/gi18n.h>
 #include <config.h>
 
 #include <dbus/dbus-glib-lowlevel.h>
diff --git a/src/mcd-account.c b/src/mcd-account.c
index d43a69a..ae4dbc7 100644
--- a/src/mcd-account.c
+++ b/src/mcd-account.c
@@ -29,7 +29,6 @@
 #include <string.h>
 
 #include <dbus/dbus.h>
-#include <glib/gi18n.h>
 #include <glib/gstdio.h>
 #include <telepathy-glib/gtypes.h>
 #include <telepathy-glib/interfaces.h>
diff --git a/src/mcd-channel.c b/src/mcd-channel.c
index e6c23d8..42f92e0 100644
--- a/src/mcd-channel.c
+++ b/src/mcd-channel.c
@@ -37,8 +37,6 @@
 
 #include "mcd-channel.h"
 
-#include <glib/gi18n.h>
-
 #include <telepathy-glib/dbus.h>
 #include <telepathy-glib/gtypes.h>
 #include <telepathy-glib/interfaces.h>
diff --git a/src/mcd-connection.c b/src/mcd-connection.c
index 4b27633..f0c82d9 100644
--- a/src/mcd-connection.c
+++ b/src/mcd-connection.c
@@ -41,7 +41,6 @@
 #include <sched.h>
 
 #include <glib.h>
-#include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
 #include <string.h>
diff --git a/src/mcd-dispatch-operation.c b/src/mcd-dispatch-operation.c
index f21edf8..b76b1cd 100644
--- a/src/mcd-dispatch-operation.c
+++ b/src/mcd-dispatch-operation.c
@@ -31,7 +31,6 @@
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
 #include <telepathy-glib/defs.h>
diff --git a/src/mcd-dispatcher.c b/src/mcd-dispatcher.c
index 7ce02dd..f9d1c56 100644
--- a/src/mcd-dispatcher.c
+++ b/src/mcd-dispatcher.c
@@ -38,7 +38,6 @@
 #include <dlfcn.h>
 #include <glib.h>
 #include <glib/gprintf.h>
-#include <glib/gi18n.h>
 
 #include <dbus/dbus-glib-lowlevel.h>
 
diff --git a/src/mcd-manager.c b/src/mcd-manager.c
index ce6e1f2..d19cfc0 100644
--- a/src/mcd-manager.c
+++ b/src/mcd-manager.c
@@ -44,7 +44,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <glib/gi18n.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "mcd-connection.h"
diff --git a/src/mcd-master.c b/src/mcd-master.c
index 06bb60c..d4be1b7 100644
--- a/src/mcd-master.c
+++ b/src/mcd-master.c
@@ -57,7 +57,6 @@
 #include <sys/types.h>
 #endif
 
-#include <glib/gi18n.h>
 #include <gmodule.h>
 #include <string.h>
 #include <dbus/dbus.h>
diff --git a/src/mcd-mission.c b/src/mcd-mission.c
index 8bb0430..ca49479 100644
--- a/src/mcd-mission.c
+++ b/src/mcd-mission.c
@@ -51,7 +51,6 @@
 
 #include "mcd-mission-priv.h"
 
-#include <glib/gi18n.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 #include "mcd-enum-types.h"
diff --git a/src/mcd-operation.c b/src/mcd-operation.c
index 2dd46a5..6c1595c 100644
--- a/src/mcd-operation.c
+++ b/src/mcd-operation.c
@@ -38,7 +38,6 @@
  * established.
  */
 
-#include <glib/gi18n.h>
 #include "mcd-operation.h"
 #include "mcd-mission-priv.h"
 
diff --git a/src/mcd-proxy.c b/src/mcd-proxy.c
index 2d2b2a2..5c3ef74 100644
--- a/src/mcd-proxy.c
+++ b/src/mcd-proxy.c
@@ -37,7 +37,6 @@
 
 #include "mcd-proxy.h"
 
-#include <glib/gi18n.h>
 #include <telepathy-glib/telepathy-glib.h>
 
 #define MCD_PROXY_PRIV(proxy) (G_TYPE_INSTANCE_GET_PRIVATE ((proxy), \
-- 
1.7.7