Use upstream gettext instead the glib one

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" "$@"

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