From c85524d0751348fad05800f9e61e3461861393b7 Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Tue, 17 Oct 2006 18:58:18 +0000 Subject: Try to workaround the problem 'reported' by Mr_Bones_... but this is just a workaround. --- eclass/autotools.eclass | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'eclass/autotools.eclass') diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 963c6008b1eb..ed12e4420a46 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.48 2006/10/16 08:12:01 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.49 2006/10/17 18:58:18 flameeyes Exp $ # # Author: Diego Pettenò # Enhancements: Martin Schlemmer @@ -15,13 +15,17 @@ inherit eutils libtool _automake_atom="sys-devel/automake" _autoconf_atom="sys-devel/autoconf" if [[ -n ${WANT_AUTOMAKE} ]] && [[ ${WANT_AUTOMAKE} != "latest" ]]; then - _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" + case ${WANT_AUTOMAKE} in + # workaround while we have different versions of automake in arch and ~arch + latest) _automake_atom="|| ( =sys-devel/automake-1.10* =sys-devel/automake-1.9* )" + *) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;; + esac fi 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.59" ;; + latest | 2.5) _autoconf_atom=">=sys-devel/autoconf-2.59" ;; esac fi DEPEND="${_automake_atom} -- cgit v1.2.3-65-gdbad