mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "go back to allowing gettext 0.11.5, but don't mix with libtool 2.2"

Browse source 
This reverts commit 31c09d738c.

Reverting this, since it breaks autogen.sh for me on debian sid.
Failure is: "libtool 2.2 requires autopoint 0.17 or higher" even though
0.17 was found.
This commit is contained in:
Tim-Philipp Müller 2009-06-03 09:45:25 +01:00
parent b345a8d0db
commit db6f3ae042
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
autogen.sh
View file

@ -42,7 +42,7 @@ version_check "autoconf" "$AUTOCONF autoconf autoconf259 autoconf257 autoconf-2.
version_check "automake" "$AUTOMAKE automake automake-1.9 automake19 automake-1.8 automake18 automake-1.7 automake17 automake-1.6 automake16" \ version_check "automake" "$AUTOMAKE automake automake-1.9 automake19 automake-1.8 automake18 automake-1.7 automake17 automake-1.6 automake16" \
"ftp://ftp.gnu.org/pub/gnu/automake/" 1 7 || DIE=1 "ftp://ftp.gnu.org/pub/gnu/automake/" 1 7 || DIE=1
version_check "autopoint" "autopoint" \ version_check "autopoint" "autopoint" \
"ftp://ftp.gnu.org/pub/gnu/gettext/" 0 11 5 || DIE=1 "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 17 || DIE=1
version_check "libtoolize" "libtoolize libtoolize15 glibtoolize" \ version_check "libtoolize" "libtoolize libtoolize15 glibtoolize" \
"ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1 "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1
version_check "pkg-config" "" \ version_check "pkg-config" "" \
@ -53,7 +53,6 @@ die_check $DIE
autoconf_2_52d_check || DIE=1 autoconf_2_52d_check || DIE=1
aclocal_check || DIE=1 aclocal_check || DIE=1
autoheader_check || DIE=1 autoheader_check || DIE=1
libtool_2_2_gettext_check || DIE=1
die_check $DIE die_check $DIE

2
common

@ -1 +1 @@
Subproject commit 22cfb47cf8add0ffb07c12181f32bf2e33c393e5 Subproject commit c57272152d5c40617fab305d839db1b1fefe0ea0

2
configure.ac
View file

@ -63,7 +63,7 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I common/m4")
dnl set up gettext dnl set up gettext
dnl the version check needs to stay here because autopoint greps for it dnl the version check needs to stay here because autopoint greps for it
AM_GNU_GETTEXT_VERSION([0.11.5]) AM_GNU_GETTEXT_VERSION([0.17])
AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT([external])
AG_GST_GETTEXT([gstreamer-$GST_MAJORMINOR]) AG_GST_GETTEXT([gstreamer-$GST_MAJORMINOR])