diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-09-20 15:10:03 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-09-20 15:10:03 +0000 |
| commit | e265d1bc55c72b1ec22649a3a58e3ae75d0d3228 (patch) | |
| tree | 1ce481a850ca030a00a0e75382c85191889ece70 /eclass/autotools.eclass | |
| parent | Block kdelibs, thanks to Sho_ for noticing. (diff) | |
| download | gentoo-2-e265d1bc55c72b1ec22649a3a58e3ae75d0d3228.tar.gz gentoo-2-e265d1bc55c72b1ec22649a3a58e3ae75d0d3228.tar.bz2 gentoo-2-e265d1bc55c72b1ec22649a3a58e3ae75d0d3228.zip | |
Accept autoconf 2.60 when using WANT_AUTOCONF=2.5, to avoid up-down cycles.
Diffstat (limited to 'eclass/autotools.eclass')
| -rw-r--r-- | eclass/autotools.eclass | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 0aafc59e9a01..ea6a8b2c22b1 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.40 2006/09/16 21:23:32 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.41 2006/09/20 15:10:03 flameeyes Exp $ # # Author: Diego Pettenò <flameeyes@gentoo.org> # Enhancements: Martin Schlemmer <azarah@gentoo.org> @@ -15,7 +15,12 @@ inherit eutils libtool _automake_atom="sys-devel/automake" _autoconf_atom="sys-devel/autoconf" [[ -n ${WANT_AUTOMAKE} ]] && _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" -[[ -n ${WANT_AUTOCONF} ]] && _autoconf_atom="=sys-devel/autoconf-${WANT_AUTOCONF}*" +if [[ -n ${WANT_AUTOCONF} ]]; then + case ${WANT_AUTOCONF} in + 2.1) _autoconf_atom="=sys-devel/autoconf-${WANT_AUTOCONF}*" ;; + 2.5) _autoconf_atom=">=sys-devel/autoconf-2.5" ;; + esac +fi DEPEND="${_automake_atom} ${_autoconf_atom} sys-devel/libtool" |