[gxml/autotools_fixes: 9/9] Use upstream gettext instead the glib one

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

commit 79a1c9300df2d0cc76bb682f30b89604bddc3f39
Author: Javier JardÃn <jjardon gnome org>
Date:   Fri Aug 24 02:46:57 2012 +0900

    Use upstream gettext instead the glib one

 Makefile.am       |    1 +
 autogen.sh        |    9 +--
 configure.ac      |    7 +-
 po/Makefile.in.in |  222 -----------------------------------------------------
 4 files changed, 9 insertions(+), 230 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5e5745d..f1d2c5c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,6 +38,7 @@ INTLTOOL_FILES = intltool-extract.in \
 EXTRA_DIST = $(gxmldoc_DATA) \
 	autogen.sh \
 	vapi \
+	config.rpath \
 	$(INTLTOOL_FILES)
 
 
diff --git a/autogen.sh b/autogen.sh
index 506cd34..5fbd8e1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -34,12 +34,9 @@ fi
 
 mkdir -p m4
 
-autoreconf -i -f
-intltoolize --force --copy --automake
-# presumably, this will obvious our tests for:
-#   srcdir, autoconf, intltool, xml-i18n-toolize (opt), libtool, glib (gettext), automake, aclocal
-#   TODO: test that disabling any of these results in autoreconf and intltoolize handling it
-#         gracefully or re-add checks
+autopoint --force || exit 1
+AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install
+
 
 cd $OLDDIR
 
diff --git a/configure.ac b/configure.ac
index 4c1ecc8..3ee3bf5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,10 +69,12 @@ AM_PROG_CC_C_O
 # Internationalization
 IT_PROG_INTLTOOL([0.35.0])
 
+AM_GNU_GETTEXT_VERSION([0.18.1])
+AM_GNU_GETTEXT([external])
+
 GETTEXT_PACKAGE=gxml
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
-AM_GLIB_GNU_GETTEXT
 
 # Initialise libtools (handles library creation) with stuff from above
 LT_INIT([disable-static])
@@ -174,7 +176,8 @@ gxml/gxml.pc
 gxml/Makefile
 test/Makefile
 docs/Makefile
-po/Makefile.in])
+po/Makefile.in
+])
 AC_OUTPUT