From 9f1a7b6831ce80dfeeb8d148dd12dbc4731bcced Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 20 May 2012 13:01:22 +0000
Subject: change eautomake over to autotools_check_macro now that we cache the
 results and it should be quick

---
 eclass/autotools.eclass | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'eclass')

diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index 4257496fea79..ca7083d07c46 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.137 2012/05/20 12:58:23 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.138 2012/05/20 13:01:22 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -283,11 +283,7 @@ eautomake() {
 	done
 
 	if [[ -z ${makefile_name} ]] ; then
-		# Really we should just use autotools_check_macro ...
-		local am_init_automake=$(sed -n '/AM_INIT_AUTOMAKE/{s:#.*::;s:\<dnl\>.*::;p}' configure.??)
-		if [[ ${am_init_automake} != *"AM_INIT_AUTOMAKE"* ]] ; then
-			return 0
-		fi
+		[[ -n $(autotools_check_macro AM_INIT_AUTOMAKE) ]] || return 0
 
 	elif [[ -z ${FROM_EAUTORECONF} && -f ${makefile_name%.am}.in ]]; then
 		local used_automake
-- 
cgit v1.2.3-65-gdbad