--- /usr/portage/eclass/autotools.eclass	2008-04-23 23:39:00.000000000 -0400
+++ /usr/local/portage/eclass/autotools.eclass	2008-05-07 19:08:45.000000000 -0400
@@ -117,8 +117,10 @@
 eaclocal() {
 	local aclocal_opts
 
+	local amflags_files
+	amflags_files=${AT_AMFLAGS_FILES- GNUmakefile.am Makefile.am GNUmakefile.in Makefile.in }
 	local amflags_file
-	for amflags_file in GNUmakefile.am Makefile.am GNUmakefile.in Makefile.in ; do
+	for amflags_file in ${amflags_files} ; do
 		[[ -e ${amflags_file} ]] || continue
 		aclocal_opts=$(sed -n '/^ACLOCAL_AMFLAGS[[:space:]]*=/s:[^=]*=::p' ${amflags_file})
 		eval aclocal_opts=\"${aclocal_opts}\"