From 8ebf2ffc3e07c9cbbbdaac8b4ccd28a584775d3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Fri, 9 Sep 2011 12:40:50 +0100
Subject: [PATCH] Use upstream gettext instead the glib one

https://bugzilla.gnome.org/show_bug.cgi?id=658647
---
 autogen.sh   |  1 +
 configure.ac | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index f1ceb4d..1eeb771 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
 mkdir -p m4
+autopoint --force
 AUTOPOINT='intltoolize --automake --copy' autoreconf -fiv -Wall || exit
 ./configure --enable-maintainer-mode "$@"
diff --git a/configure.ac b/configure.ac
index 6e13366..a52fd38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,13 +19,17 @@ LT_INIT
 AC_PROG_CC
 AM_PROG_VALAC([0.13.0])
 AC_PROG_INSTALL
-IT_PROG_INTLTOOL([0.35])
+
+# i18n stuff
+IT_PROG_INTLTOOL([0.40])
+
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.17])
 
 GETTEXT_PACKAGE=gnome-contacts
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext Package])
 AC_SUBST(GETTEXT_PACKAGE)
-AM_GNU_GETTEXT_VERSION([1.11])
-AM_GLIB_GNU_GETTEXT
+
 
 pkg_modules="gtk+-3.0
 	     gnome-desktop-3.0