[giggle] Use upstream gettext instead glib one

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

commit 7eb32e8d39c382b3bd8a670198b77cbc844c60a7
Author: Javier Jardón <jjardon gnome org>
Date:   Sat Jun 26 05:22:58 2010 +0200

    Use upstream gettext instead glib one

 autogen.sh      |    2 ++
 configure.ac    |    7 ++++---
 src/Makefile.am |    1 +
 3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 671d337..2e827ec 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -18,4 +18,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 741ee99..cfcf3a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,11 +129,12 @@ dnl  ------------------
 dnl | Language Support |---------------------------------------
 dnl  ------------------
 IT_PROG_INTLTOOL([0.40.0])
-AC_SUBST([GETTEXT_PACKAGE], [giggle])
+
 AM_GNU_GETTEXT_VERSION([0.17])
-AM_GLIB_GNU_GETTEXT
+AM_GNU_GETTEXT([external])
+
+AC_SUBST([GETTEXT_PACKAGE], [giggle])
 AC_DEFINE([GETTEXT_PACKAGE], [PACKAGE_TARNAME],[Define to the gettext package name])
-AM_GLIB_DEFINE_LOCALEDIR(LOCALEDIR)
 
 AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index ecff553..87d3fea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,7 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-DICONDIR='"$(datadir)/icons"' \
 	-DGLADEDIR='"$(pkgdatadir)/glade"' \
+	-DLOCALEDIR=\"$(localedir)\" \
 	$(GIGGLE_CFLAGS) $(PLATFORM_CFLAGS) \
 	$(WARN_CFLAGS)