diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-06-03 09:45:25 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-06-03 09:49:59 +0100 |
| commit | db6f3ae042511987de017d6c30c09d742df31f41 (patch) | |
| tree | 4c65f08131e7e5055647bfa31b4ff92fbda8099a /autogen.sh | |
| parent | b345a8d0dbb893d16192603b9894c79adc275ab6 (diff) | |
Revert "go back to allowing gettext 0.11.5, but don't mix with libtool 2.2"
This reverts commit 31c09d738ce7f47bff9d292996e9489c275e55a1.
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.
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/autogen.sh b/autogen.sh index feeaa3c8ff..266a808478 100755 --- a/autogen.sh +++ b/autogen.sh @@ -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" \ "ftp://ftp.gnu.org/pub/gnu/automake/" 1 7 || DIE=1 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" \ "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1 version_check "pkg-config" "" \ @@ -53,7 +53,6 @@ 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 |