build-sys: Use upstream gettext instead glib one

diff --git a/Makefile.am b/Makefile.am
index b0b255348b8c1a277730fc30f56d9c88cd17285a..2a1e9f66067f8fff6b66ea48a95ed6d3573401b3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@ ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST = \
        bootstrap.sh \
+       config.rpath \
        git-version-gen \
        LICENSE \
        GPL \

diff --git a/bootstrap.sh b/bootstrap.sh
index d0baf9500a75dbd22862fbce22d92a1fee4b2d62..0ad60ca64b9b14286226f290949a321ca7cb0ac4 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -68,7 +68,6 @@ if ! pkg-config --version &>/dev/null; then
 fi
 
 # Other necessary programs
-glib-gettextize --version >/dev/null || DIE=1
 intltoolize --version >/dev/null || DIE=1
 $LIBTOOLIZE --version >/dev/null || DIE=1
 test "$DIE" = 1 && exit 1
@@ -85,7 +84,7 @@ else
     rm -f config.cache
 
     rm -f Makefile.am~ configure.ac~
-    glib-gettextize --copy --force
+    autopoint --force
     test -f Makefile.am~ && mv Makefile.am~ Makefile.am
     test -f configure.ac~ && mv configure.ac~ configure.ac
 

diff --git a/configure.ac b/configure.ac
index 388fae2556c94855ba2224357834ef0014d17389..9e33bb98d069318f18d9123768769a3768839cce 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -97,10 +97,13 @@ PKG_PROG_PKG_CONFIG
 
 if test "x$enable_nls" != "xno"; then
 IT_PROG_INTLTOOL([0.35.0])
+
+AM_GNU_GETTEXT_VERSION([0.18.1])
+AM_GNU_GETTEXT([external])
+
 GETTEXT_PACKAGE=pulseaudio
 AC_SUBST([GETTEXT_PACKAGE])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
-AM_GLIB_GNU_GETTEXT
 
 pulselocaledir='${prefix}/${DATADIRNAME}/locale'
 AX_DEFINE_DIR(PULSE_LOCALEDIR, pulselocaledir, [Gettext locale dir])