summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-09-17 23:15:51 +0000
committerMike Frysinger <vapier@gentoo.org>2007-09-17 23:15:51 +0000
commitd96928daa406ca2a395883b9287019f217058228 (patch)
treea98cbcf60f0622b813a3380ef7f17456f6c790dc /eclass/autotools.eclass
parentfixed bug #192396, parameter changing vof to vf; thanks to C.Mueller for repo... (diff)
downloadhistorical-d96928daa406ca2a395883b9287019f217058228.tar.gz
historical-d96928daa406ca2a395883b9287019f217058228.tar.bz2
historical-d96928daa406ca2a395883b9287019f217058228.zip
add support for WANT_AUTOCONF=none #192863 and catch invalid WANT_AUTOCONF settings
Diffstat (limited to 'eclass/autotools.eclass')
-rw-r--r--eclass/autotools.eclass13
1 files changed, 7 insertions, 6 deletions
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 4778d81504e4..7545c51762ab 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.66 2007/05/30 15:45:01 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.67 2007/09/17 23:15:51 vapier Exp $
#
# Maintainer: base-system@gentoo.org
#
@@ -18,10 +18,9 @@ _automake_atom="sys-devel/automake"
_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
+ none) _automake_atom="" ;; # some packages don't require automake at all
latest) _automake_atom="=sys-devel/automake-1.10*" ;;
- *) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;;
+ *) _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;;
esac
[[ ${WANT_AUTOMAKE} == "latest" ]] && WANT_AUTOMAKE="1.10"
export WANT_AUTOMAKE
@@ -29,8 +28,10 @@ fi
if [[ -n ${WANT_AUTOCONF} ]] ; then
case ${WANT_AUTOCONF} in
- 2.1) _autoconf_atom="=sys-devel/autoconf-${WANT_AUTOCONF}*" ;;
- latest | 2.5) _autoconf_atom=">=sys-devel/autoconf-2.59" ;;
+ none) _autoconf_atom="" ;; # some packages don't require autoconf at all
+ 2.1) _autoconf_atom="=sys-devel/autoconf-${WANT_AUTOCONF}*" ;;
+ latest|2.5) _autoconf_atom=">=sys-devel/autoconf-2.61" ;;
+ *) _autoconf_atom=">=sys-devel/autoconf-FAIL" ;;
esac
[[ ${WANT_AUTOCONF} == "latest" ]] && WANT_AUTOCONF="2.5"
export WANT_AUTOCONF