diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-03-22 15:14:53 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-03-22 15:14:53 +0000 |
| commit | 8d306813107a724ad870a72b7b3211943fbb0f1b (patch) | |
| tree | d8554ead5c55601f409a38a43dc4cc244ba29c83 /eclass/autotools.eclass | |
| parent | add upstream patch for memory leak caused by messages that couldn't be flushe... (diff) | |
| download | gentoo-2-8d306813107a724ad870a72b7b3211943fbb0f1b.tar.gz gentoo-2-8d306813107a724ad870a72b7b3211943fbb0f1b.tar.bz2 gentoo-2-8d306813107a724ad870a72b7b3211943fbb0f1b.zip | |
handle commented out AM_INIT_AUTOMAKE #398743
Diffstat (limited to 'eclass/autotools.eclass')
| -rw-r--r-- | eclass/autotools.eclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index b5b9f66c7d8b..314497a3acc8 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.128 2012/03/21 21:51:32 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.129 2012/03/22 15:14:53 vapier Exp $ # @ECLASS: autotools.eclass # @MAINTAINER: @@ -294,7 +294,9 @@ eautomake() { done if [[ -z ${makefile_name} ]] ; then - if ! grep -qs AM_INIT_AUTOMAKE configure.?? ; 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 |