mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

build-sys: Use upstream gettext instead glib one

Browse source
This commit is contained in:
Javier Jardón 2013-03-27 14:00:36 +00:00 • committed by Arun Raghavan
parent 3086d01dd7
commit b2a0a1575d
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile.am
View file

@ -19,6 +19,7 @@ ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = \ EXTRA_DIST = \
bootstrap.sh \ bootstrap.sh \
config.rpath \
git-version-gen \ git-version-gen \
LICENSE \ LICENSE \
GPL \ GPL \

3
bootstrap.sh
View file

@ -68,7 +68,6 @@ if ! pkg-config --version &>/dev/null; then
fi fi
# Other necessary programs # Other necessary programs
glib-gettextize --version >/dev/null || DIE=1
intltoolize --version >/dev/null || DIE=1 intltoolize --version >/dev/null || DIE=1
$LIBTOOLIZE --version >/dev/null || DIE=1 $LIBTOOLIZE --version >/dev/null || DIE=1
test "$DIE" = 1 && exit 1 test "$DIE" = 1 && exit 1
@ -85,7 +84,7 @@ else
rm -f config.cache rm -f config.cache
rm -f Makefile.am~ configure.ac~ rm -f Makefile.am~ configure.ac~
glib-gettextize --copy --force autopoint --force
test -f Makefile.am~ && mv Makefile.am~ Makefile.am test -f Makefile.am~ && mv Makefile.am~ Makefile.am
test -f configure.ac~ && mv configure.ac~ configure.ac test -f configure.ac~ && mv configure.ac~ configure.ac

5
configure.ac
View file

@ -97,10 +97,13 @@ PKG_PROG_PKG_CONFIG
if test "x$enable_nls" != "xno"; then if test "x$enable_nls" != "xno"; then
IT_PROG_INTLTOOL([0.35.0]) IT_PROG_INTLTOOL([0.35.0])
AM_GNU_GETTEXT_VERSION([0.18.1])
AM_GNU_GETTEXT([external])
GETTEXT_PACKAGE=pulseaudio GETTEXT_PACKAGE=pulseaudio
AC_SUBST([GETTEXT_PACKAGE]) AC_SUBST([GETTEXT_PACKAGE])
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
AM_GLIB_GNU_GETTEXT
pulselocaledir='${prefix}/${DATADIRNAME}/locale' pulselocaledir='${prefix}/${DATADIRNAME}/locale'
AX_DEFINE_DIR(PULSE_LOCALEDIR, pulselocaledir, [Gettext locale dir]) AX_DEFINE_DIR(PULSE_LOCALEDIR, pulselocaledir, [Gettext locale dir])