[yelp] Use upstream gettext instead the Glib one

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

commit 3f0ca578dc6faaf905995169be50b5d6cf7e4b51
Author: Javier Jardón <jjardon gnome org>
Date:   Fri Oct 1 06:51:11 2010 +0200

    Use upstream gettext instead the Glib one

 autogen.sh      |    2 ++
 configure.ac    |    5 +++--
 src/Makefile.am |    1 +
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 7b831d6..8c386a6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -16,4 +16,6 @@ which gnome-autogen.sh || {
     exit 1
 }
 
+autopoint --force || exit $?
+
 USE_GNOME2_MACROS=1 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index 365bcf6..c48fac2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,13 +61,14 @@ fi
 # i18n stuff
 IT_PROG_INTLTOOL([0.41.0])
 
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.17])
+
 GETTEXT_PACKAGE=yelp
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
                    [The gettext translation domain])
 
-AM_GLIB_GNU_GETTEXT
-AM_GLIB_DEFINE_LOCALEDIR([GNOMELOCALEDIR])
 
 LIBLZMA_REQUIRED=4.9
 AC_ARG_ENABLE(lzma,
diff --git a/src/Makefile.am b/src/Makefile.am
index d4655b9..9c563cd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,6 +18,7 @@ YELP_DEFINES =								\
 	-DPREFIX=\""$(prefix)"\"					\
 	-DSYSCONFDIR=\""$(sysconfdir)"\"				\
 	-DDATADIR=\""$(datadir)"\"					\
+	-DLOCALEDIR=\""$(localedir)"\"					\
 	-DLIBDIR=\""$(libdir)"\"					\
 	-DIMAGEDIR=\""$(datadir)/images/yelp"\"				\
 	-DSERVERDIR=\"$(libexecdir)\"					\