From 75894ebb2e414047e153fbbbfa6d291b76be4f8d Mon Sep 17 00:00:00 2001
From: Javier Jardón <jjardon@gnome.org>
Date: Mon, 18 Jul 2011 19:53:21 +0200
Subject: Use upstream gettext instead the glib one

---
 autogen.sh   |  4 ++--
 configure.ac | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/autogen.sh b/autogen.sh
index c2954a7..4a686aa 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -26,8 +26,8 @@ if test -z $GTKDOCIZE; then
 fi
 
 gtkdocize
-intltoolize --copy --force --automake
-autoreconf --force --install --verbose
+autopoint --force
+AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
 
 cd $olddir
 test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
diff --git a/configure.ac b/configure.ac
index 8762c89..9afd298 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,11 +220,15 @@ if test "x$GCC" = "xyes"; then
   LDFLAGS="-Wl,--as-needed $LDFLAGS"
 fi
 
+# i18n support
 IT_PROG_INTLTOOL([0.40.0])
-GETTEXT_PACKAGE=upower
-AC_SUBST([GETTEXT_PACKAGE])
-AM_GLIB_GNU_GETTEXT
-AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain])
+
+AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT([external])
+
+AC_SUBST([GETTEXT_PACKAGE],[${PACKAGE_TARNAME}])
+AC_DEFINE([GETTEXT_PACKAGE],[PACKAGE_TARNAME],[Define to the gettext package name])
+
 
 AC_CONFIG_FILES([
 Makefile
-- 
cgit v1.2.3