diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-05-24 01:13:32 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-05-24 01:13:32 +0000 |
| commit | 38bce8c21a05f244c3815479958450499077637f (patch) | |
| tree | e311a960b0bdcad37dcdbd44842ea2a607ed74f6 /eclass/autotools.eclass | |
| parent | Version bump with ~ppc/~ppc64 keywording. Require at least Python 2.6 and res... (diff) | |
| download | historical-38bce8c21a05f244c3815479958450499077637f.tar.gz historical-38bce8c21a05f244c3815479958450499077637f.tar.bz2 historical-38bce8c21a05f244c3815479958450499077637f.zip | |
do not require aclocal.m4 to trace macros as simpler packages might not end up generating one, yet will expand autoconf macros all the time that might be the ones we are looking for #417275 by Rick Farina
Diffstat (limited to 'eclass/autotools.eclass')
| -rw-r--r-- | eclass/autotools.eclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index da4b6135bc55..2d165e0def5a 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.141 2012/05/21 18:13:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.142 2012/05/24 01:13:32 vapier Exp $ # @ECLASS: autotools.eclass # @MAINTAINER: @@ -210,11 +210,11 @@ eautoreconf() { # @INTERNAL # See if the specified macros are enabled. _at_uses_pkg() { - if [[ -e aclocal.m4 ]] ; then - # If aclocal.m4 exists, trust the trace data. - [[ -n $(autotools_check_macro "${@}") ]] + if [[ -n $(autotools_check_macro "$@") ]] ; then + return 0 else - # If aclocal.m4 hasn't been generated yet, cheat, but be conservative. + # If the trace didn't find it (perhaps because aclocal.m4 hasn't + # been generated yet), cheat, but be conservative. local macro args=() for macro ; do args+=( -e "^[[:space:]]*${macro}\>" ) |