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

[Mike Frysinger (vapier)]

vapier      08/04/22 22:38:22

  Modified:             autotools.eclass
  Log:
  rip out ACLOCAL_AMFLAGS from Makefiles #142787

Revision  Changes    Path
1.74                 eclass/autotools.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.73&r2=1.74

Index: autotools.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- autotools.eclass	31 Mar 2008 14:19:35 -0000	1.73
+++ autotools.eclass	22 Apr 2008 22:38:22 -0000	1.74
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.73 2008/03/31 14:19:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.74 2008/04/22 22:38:22 vapier Exp $
 #
 # Maintainer: base-system@g.o
 #
@@ -117,6 +117,13 @@
 eaclocal() {
 	local aclocal_opts
 
+	local amflags_file
+	for amflags_file in GNUmakefile.am Makefile.am GNUmakefile.in Makefile.in ; do
+		[[ -e ${amflags_file} ]] || continue
+		aclocal_opts=$(sed -n '/^ACLOCAL_AMFLAGS[[:space:]]*=/s:[^=]*=::p' ${amflags_file})
+		break
+	done
+
 	if [[ -n ${AT_M4DIR} ]] ; then
 		for x in ${AT_M4DIR} ; do
 			case "${x}" in



-- 
gentoo-commits@l.g.o mailing list