[glom] Use upstream gettext instead Glib one

[Murray Cumming <murrayc src gnome org>]

commit 074193bb3f583c61f94955203ec0052c0ce8587f
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Oct 5 03:14:37 2010 +0200

    Use upstream gettext instead Glib one
    
    	* configure.ac: Do not use AM_GLIB_GNU_GETTEXT() because it is no longer
    	maintained/recommended.
    	This fixes bug #631367

 ChangeLog    |    8 ++++++++
 autogen.sh   |    1 +
 configure.ac |    7 +++++--
 3 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 35130b0..9e1fbc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-17  Javier Jardón  <jjardon gnome org>
+
+	Use upstream gettext instead Glib one
+
+	* configure.ac: Do not use AM_GLIB_GNU_GETTEXT() because it is no longer 
+	maintained/recommended.
+	This fixes bug #631367
+
 2010-11-17  Murray Cumming  <murrayc murrayc com>
 
 	Import tests: Uncomment some tests and make them test what we really want.
diff --git a/autogen.sh b/autogen.sh
index 9bf92f3..8345e8b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,6 +6,7 @@ test -n "$srcdir" || srcdir=.
   gnome-doc-common --copy &&
   gnome-doc-prepare --automake --copy --force &&
   mm-common-prepare --copy --force &&
+  autopoint --force &&
   AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install
 ) || exit
 test -n "$NOCONFIGURE" || "$srcdir/configure" --enable-maintainer-mode "$@"
diff --git a/configure.ac b/configure.ac
index 311ddc4..f9b127c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,10 +62,13 @@ AS_IF([test "x$glom_enable_maemo" != xyes],
           [Define if libgettextpo provides the new po_xerror_handler struct.])])
 ])
 
+# i18n
 IT_PROG_INTLTOOL([0.35])
+
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.17])
+
 AC_SUBST([GETTEXT_PACKAGE], [glom])
-AM_GNU_GETTEXT_VERSION([0.11])
-AM_GLIB_GNU_GETTEXT
 AC_DEFINE([GETTEXT_PACKAGE], [PACKAGE_TARNAME], [Define to the gettext package name.])
 
 AC_MSG_CHECKING([whether to enable Windows specific options])