diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-10-16 08:12:01 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-10-16 08:12:01 +0000 |
| commit | 00f36c4ea0395302ede856c21a96c472b5883c4d (patch) | |
| tree | 3ee9f095c5d8045f9b2ab6d87bbb66266bb63bd0 /eclass/autotools.eclass | |
| parent | version bump from upstream (diff) | |
| download | gentoo-2-00f36c4ea0395302ede856c21a96c472b5883c4d.tar.gz gentoo-2-00f36c4ea0395302ede856c21a96c472b5883c4d.tar.bz2 gentoo-2-00f36c4ea0395302ede856c21a96c472b5883c4d.zip | |
Make sure that if latest autotools were asked, latest automake is used.
Diffstat (limited to 'eclass/autotools.eclass')
| -rw-r--r-- | eclass/autotools.eclass | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index afebe9f467e1..963c6008b1eb 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.47 2006/10/02 22:52:08 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.48 2006/10/16 08:12:01 flameeyes Exp $ # # Author: Diego Pettenò <flameeyes@gentoo.org> # Enhancements: Martin Schlemmer <azarah@gentoo.org> @@ -12,12 +12,12 @@ inherit eutils libtool -[[ ${WANT_AUTOMAKE} == "latest" ]] && export WANT_AUTOMAKE=1.9 -[[ ${WANT_AUTOCONF} == "latest" ]] && export WANT_AUTOCONF=2.5 - _automake_atom="sys-devel/automake" _autoconf_atom="sys-devel/autoconf" -[[ -n ${WANT_AUTOMAKE} ]] && _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" +if [[ -n ${WANT_AUTOMAKE} ]] && [[ ${WANT_AUTOMAKE} != "latest" ]]; then + _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" +fi + if [[ -n ${WANT_AUTOCONF} ]] ; then case ${WANT_AUTOCONF} in 2.1) _autoconf_atom="=sys-devel/autoconf-${WANT_AUTOCONF}*" ;; @@ -188,6 +188,7 @@ autotools_set_versions() { [[ -n ${autotools_version_sets} ]] && return 0 if [[ -n ${WANT_AUTOCONF} ]]; then + [[ ${WANT_AUTOCONF} == "latest" ]] && WANT_AUTOCONF="2.5" export WANT_AUTOCONF einfo "Requested autoconf ${WANT_AUTOCONF}" einfo "Using $(autoconf --version 2>/dev/null | head -n 1)" @@ -195,6 +196,11 @@ autotools_set_versions() { fi if [[ -n ${WANT_AUTOMAKE} ]]; then + if [[ ${WANT_AUTOMAKE} == "latest" ]]; then + # Consider starting from 1.9, as that is stable everywhere. + has_version '~sys-devel/automake-1.9' && WANT_AUTOMAKE="1.9" + has_version '~sys-devel/automake-1.10' && WANT_AUTOMAKE="1.10" + fi export WANT_AUTOMAKE einfo "Requested automake ${WANT_AUTOMAKE}" einfo "Using $(automake --version 2>/dev/null | head -n 1)" |