From dd098bc7a7ad88bf3477565ad96b56f6571dcd50 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Mon, 8 Jan 2007 23:04:49 +0000 Subject: [PATCH] For packages where automake is not used, set WANT_AUTOMAKE=none. Please note, though, that _aclocal_ is part of automake package. --- eclass/autotools.eclass | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index c40000fc895d..a281a1dc0015 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.61 2007/01/04 14:56:46 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.62 2007/01/08 23:04:49 flameeyes Exp $ # # Author: Diego Pettenò # Enhancements: Martin Schlemmer @@ -17,6 +17,7 @@ _autoconf_atom="sys-devel/autoconf" if [[ -n ${WANT_AUTOMAKE} ]]; then case ${WANT_AUTOMAKE} in # workaround while we have different versions of automake in arch and ~arch + none) _automake_atom="" ;; # some packages don't require automake at all latest) _automake_atom="|| ( =sys-devel/automake-1.10* =sys-devel/automake-1.9* )" ;; *) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;; esac @@ -213,10 +214,14 @@ autotools_set_versions() { ROOT=/ has_version =sys-devel/automake-${amver}* && break done fi - export WANT_AUTOMAKE - einfo "Requested automake ${latest_automake}${WANT_AUTOMAKE}" - einfo "Using $(automake --version 2>/dev/null | head -n 1)" - einfo "Using $(aclocal --version 2>/dev/null | head -n 1)" + + # Don't do stuff if no autoamke is requested/required + if [[ ${WANT_AUTOMAKE} != "none" ]]; then + export WANT_AUTOMAKE + einfo "Requested automake ${latest_automake}${WANT_AUTOMAKE}" + einfo "Using $(automake --version 2>/dev/null | head -n 1)" + einfo "Using $(aclocal --version 2>/dev/null | head -n 1)" + fi else ewarn "QA Notice: \${WANT_AUTOMAKE} variable unset. Please report on http://bugs.gentoo.org/" fi -- 2.26.2