From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SXMcX-0004pV-EH for garchives@archives.gentoo.org; Thu, 24 May 2012 01:13:42 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6FAE7E08BB; Thu, 24 May 2012 01:13:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3EADBE08BB for ; Thu, 24 May 2012 01:13:34 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9CF291B4026 for ; Thu, 24 May 2012 01:13:33 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 559) id 34E7E2004B; Thu, 24 May 2012 01:13:32 +0000 (UTC) From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: autotools.eclass X-VCS-Directories: eclass X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: <20120524011332.34E7E2004B@flycatcher.gentoo.org> Date: Thu, 24 May 2012 01:13:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 9d59feff-e98a-4ee1-9726-82143511082e X-Archives-Hash: 84d18ec1f2212fb148cbb8f165655c0b vapier 12/05/24 01:13:32 Modified: autotools.eclass Log: 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 Revision Changes Path 1.142 eclass/autotools.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.e= class?rev=3D1.142&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.e= class?rev=3D1.142&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.e= class?r1=3D1.141&r2=3D1.142 Index: autotools.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v retrieving revision 1.141 retrieving revision 1.142 diff -u -r1.141 -r1.142 --- autotools.eclass 21 May 2012 18:13:10 -0000 1.141 +++ autotools.eclass 24 May 2012 01:13:32 -0000 1.142 @@ -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 $ =20 # @ECLASS: autotools.eclass # @MAINTAINER: @@ -210,11 +210,11 @@ # @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=3D() for macro ; do args+=3D( -e "^[[:space:]]*${macro}\>" )