Use upstream gettext instead glib one

diff --git a/autogen.sh b/autogen.sh
index 38349a4..e16daa8 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -22,4 +22,7 @@ which gnome-autogen.sh || {
     echo "You need to install gnome-common from the GNOME CVS"
     exit 1
 }
+
+autopoint --force || exit $?
+
 USE_GNOME2_MACROS=1 . gnome-autogen.sh

diff --git a/configure.ac b/configure.ac
index 2ee263d..caf32ca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -249,7 +249,8 @@ dnl I18N stuff
 dnl ******************************
 IT_PROG_INTLTOOL([0.35.5])
 
-AM_GLIB_GNU_GETTEXT
+AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT([external])
 
 GETTEXT_PACKAGE=evolution-data-server-$BASE_VERSION
 AC_SUBST(GETTEXT_PACKAGE)