[gdl] Use upstream gettext instead the Glib one

[Javier Jardón <jjardon src gnome org>]

commit 595c7d4bb50d2bee5d450cae3d065fcf7aba2f3a
Author: Javier Jardón <jjardon gnome org>
Date:   Fri Oct 1 08:30:21 2010 +0200

    Use upstream gettext instead the Glib one

 autogen.sh      |    2 ++
 configure.in    |   10 ++++++----
 gdl/Makefile.am |    1 +
 3 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index fc7102d..2810fe1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -19,4 +19,6 @@ which gnome-autogen.sh || {
     exit 1
 }
 
+autopoint --force || exit $?
+
 REQUIRED_AUTOMAKE_VERSION=1.11 GNOME_DATADIR="$gnome_datadir" USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
diff --git a/configure.in b/configure.in
index 9557bbd..5fd9e97 100644
--- a/configure.in
+++ b/configure.in
@@ -118,14 +118,16 @@ AC_SUBST(GLIB_GENMARSHAL)
 GLIB_MKENUMS="`$PKG_CONFIG --variable=glib_mkenums glib-2.0`"
 AC_SUBST(GLIB_MKENUMS)
 
-ALL_LINGUAS=""
+# i18n stuff
+IT_PROG_INTLTOOL([0.40.0])
+
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.17])
+
 GETTEXT_PACKAGE=gdl-3
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
-IT_PROG_INTLTOOL([0.35.0])
 
-AM_GLIB_GNU_GETTEXT
-AM_GLIB_DEFINE_LOCALEDIR(GNOMELOCALEDIR)
 
 dnl Set PREFIX
 if test "x${prefix}" = "xNONE"; then
diff --git a/gdl/Makefile.am b/gdl/Makefile.am
index c578dfb..365bc70 100644
--- a/gdl/Makefile.am
+++ b/gdl/Makefile.am
@@ -1,5 +1,6 @@
 INCLUDES = \
 	-DG_LOG_DOMAIN=\"Gdl\"				\
+	-DGNOMELOCALEDIR=\"$(localedir)\" 		\
 	-DGDL_UIDIR=\""$(uidir)"\"		\
 	-I$(includedir) -I$(top_srcdir)			\
 	$(WARN_CFLAGS) $(DEPRECATED_FLAGS)		\