diff options
| author | Javier Jardón <jjardon@gnome.org> | 2013-03-27 14:00:36 +0000 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2013-03-28 13:21:47 +0200 |
| commit | 43c4fde642a7ff121c23571c67e11626ebba3082 (patch) | |
| tree | 5746042d9eb7c77099d88a119311b7db8240a28c | |
| parent | 5a11df596f98de0f3b14924a705128c6ac5165f9 (diff) | |
build-sys: Use upstream gettext instead glib one
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rwxr-xr-x | bootstrap.sh | 3 | ||||
| -rw-r--r-- | configure.ac | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index b0b25534..2a1e9f66 100644 --- 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 d0baf950..0ad60ca6 100755 --- 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 8a02cb7d..82b88162 100644 --- a/configure.ac +++ b/configure.ac @@ -101,10 +101,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]) |