[gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass

["Mike Frysinger (vapier)" <vapier@gentoo.org>]

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.eclass?rev=1.142&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.142&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.141&r2=1.142

Index: autotools.eclass
===================================================================
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 $
 
 # @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=()
 		for macro ; do
 			args+=( -e "^[[:space:]]*${macro}\>" )