diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2009-06-03 01:25:26 +0200 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2009-06-03 01:25:26 +0200 |
| commit | 31c09d738ce7f47bff9d292996e9489c275e55a1 (patch) | |
| tree | 7def5e10038c94081864337849bb7d21cad54f4a | |
| parent | 93b83333aad519c5555156576f0baa3be7b263f3 (diff) | |
go back to allowing gettext 0.11.5, but don't mix with libtool 2.2
| -rwxr-xr-x | autogen.sh | 3 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/autogen.sh b/autogen.sh index 27a3ca2fa..9287ea20a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -55,7 +55,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" \ "ftp://ftp.gnu.org/pub/gnu/automake/" 1 7 || DIE=1 version_check "autopoint" "autopoint" \ - "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 17 || DIE=1 + "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 11 5 || DIE=1 version_check "libtoolize" "libtoolize libtoolize15 glibtoolize" \ "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1 version_check "pkg-config" "" \ @@ -66,6 +66,7 @@ die_check $DIE autoconf_2_52d_check || DIE=1 aclocal_check || DIE=1 autoheader_check || DIE=1 +libtool_2_2_gettext_check || DIE=1 die_check $DIE diff --git a/common b/common -Subproject c57272152d5c40617fab305d839db1b1fefe0ea +Subproject 22cfb47cf8add0ffb07c12181f32bf2e33c393e diff --git a/configure.ac b/configure.ac index 9a6bec285..fbe7f61d2 100644 --- a/configure.ac +++ b/configure.ac @@ -63,7 +63,7 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I common/m4") dnl set up gettext dnl the version check needs to stay here because autopoint greps for it -AM_GNU_GETTEXT_VERSION([0.17]) +AM_GNU_GETTEXT_VERSION([0.11.5]) AM_GNU_GETTEXT([external]) AG_GST_GETTEXT([gstreamer-$GST_MAJORMINOR]) |