Use upstream gettext instead the glib one

Signed-off-by: Richard Hughes <richard@hughsie.com>

2 files changed, 21 insertions, 24 deletions

diff --git a/autogen.sh b/autogen.sh
index 7d9bfef..9a58da9 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,32 +9,27 @@
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
 
-(test -f $srcdir/configure.ac) || {
-    echo -n "**Error**: Directory \"\'$srcdir\'\" does not look like the"
-    echo " top-level package directory"
-    exit 1
-}
+olddir=`pwd`
+cd "$srcdir"
 
-if ([ -z "$*" ] && [ "x$NOCONFIGURE" = "x" ]) ; then
-  echo "**Warning**: I am going to run 'configure' with no arguments."
-  echo "If you wish to pass any to it, please specify them on the"
-  echo "'$0' command line."
-  echo
+GTKDOCIZE=`which gtkdocize`
+if test -z $GTKDOCIZE; then
+        echo "*** No GTK-Doc found, please install it ***"
+        exit 1
 fi
 
-(cd $srcdir && gtkdocize) || exit 1
-(cd $srcdir && autoreconf --force --install) || exit 1
-(cd $srcdir && intltoolize) || exit 1
+AUTORECONF=`which autoreconf`
+if test -z $AUTORECONF; then
+        echo "*** No autoreconf found, please install it ***"
+        exit 1
+fi
 
-conf_flags="--enable-gtk-doc"
+gtkdocize || exit $?
+autopoint --force
+AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
 
-if test x$NOCONFIGURE = x; then
-  echo Running $srcdir/configure $conf_flags "$@" ...
-  $srcdir/configure $conf_flags "$@" \
-  && echo Now type \`make\' to compile. || exit 1
-else
-  echo Skipping configure process.
-fi
+cd "$olddir"
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
diff --git a/configure.ac b/configure.ac
index cd08f47..b436fab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -111,11 +111,13 @@ AC_SUBST(WARNINGFLAGS_C)
 dnl ---------------------------------------------------------------------------
 dnl - gettext stuff
 dnl ---------------------------------------------------------------------------
+AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT([external])
+
 GETTEXT_PACKAGE=AC_PACKAGE_NAME
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE(GETTEXT_PACKAGE, "AC_PACKAGE_NAME", [foo])
 
-AM_GLIB_GNU_GETTEXT
 GLIB_GSETTINGS
 
 dnl ---------------------------------------------------------------------------