summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2011-07-18 19:53:21 +0200
committerRichard Hughes <richard@hughsie.com>2011-07-19 12:16:30 +0100
commit75894ebb2e414047e153fbbbfa6d291b76be4f8d (patch)
tree6427f6a6ed4602f51e25809b5b72f3f8a05fc293
parentaabd6fb9e3dcfd47c530849ac4705819dcfb9980 (diff)
Use upstream gettext instead the glib one
-rwxr-xr-xautogen.sh4
-rw-r--r--configure.ac12
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