[devhelp] Use upstream gettext instead glib one

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

commit a0302369d89c3b949013b4897b780c483ea539d8
Author: Javier Jardón <jjardon gnome org>
Date:   Mon Sep 20 00:48:32 2010 +0200

    Use upstream gettext instead glib one

 configure.ac    |    4 +++-
 src/Makefile.am |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2f9a30a..4de5ea2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,10 +109,12 @@ AC_SUBST(ZLIB_LIBS)
 # i18n stuff
 IT_PROG_INTLTOOL([0.40.0])
 
+AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT([external])
+
 GETTEXT_PACKAGE=devhelp
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Package name for gettext])
-AM_GLIB_GNU_GETTEXT
 
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
diff --git a/src/Makefile.am b/src/Makefile.am
index b57cc6f..0659ba5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,7 @@ EXTRA_DIST =			\
 
 AM_CPPFLAGS = 						\
 	-I$(top_srcdir)					\
-	-DLOCALEDIR=\""$(datadir)/locale"\" 	  	\
+	-DLOCALEDIR=\""$(localedir)"\" 	  		\
 	-DDATADIR=\""$(datadir)"\"                      \
 	-DG_LOG_DOMAIN=\"Devhelp\"			\
 	-DGDK_DISABLE_DEPRECATED			\