Fix WANT_AUTOMAKE=latest.
authorPiotr Jaroszyński <peper@gentoo.org>
Thu, 26 Oct 2006 22:05:21 +0000 (22:05 +0000)
committerPiotr Jaroszyński <peper@gentoo.org>
Thu, 26 Oct 2006 22:05:21 +0000 (22:05 +0000)
eclass/autotools.eclass

index 552ccee90b7aa92f2e3e735a26ab3a00aa49e3c4..1559488da9219c4c9fd9c0041db7eeea33f6f8e1 100644 (file)
@@ -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.52 2006/10/25 18:30:01 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.53 2006/10/26 22:05:21 peper Exp $
 #
 # Author: Diego Pettenò <flameeyes@gentoo.org>
 # Enhancements: Martin Schlemmer <azarah@gentoo.org>
@@ -202,10 +202,8 @@ autotools_set_versions() {
        if [[ -n ${WANT_AUTOMAKE} ]]; then
                if [[ ${WANT_AUTOMAKE} == "latest" ]]; then
                        for amver in 1.10 1.9 1.8 1.7 1.6; do
-                               WANT_AUTOMAKE="${amver}"
-                               if WANT_AUTOMAKE="${amver}" automake --version &> /dev/null; then
-                                       break
-                               fi
+                               has_version "=sys-devel/automake-${amver}*" && \
+                               WANT_AUTOMAKE="${amver}" && break
                        done
                fi
                export WANT_AUTOMAKE