Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass
Date: Wed, 04 Jan 2012 22:00:38
Message-Id: 20120104220028.12CFD2004B@flycatcher.gentoo.org
1 vapier 12/01/04 22:00:28
2
3 Modified: autotools.eclass
4 Log:
5 always run automake if the configure file calls AM_INIT_AUTOMAKE #397697 by My Th
6
7 Revision Changes Path
8 1.117 eclass/autotools.eclass
9
10 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.117&view=markup
11 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?rev=1.117&content-type=text/plain
12 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/autotools.eclass?r1=1.116&r2=1.117
13
14 Index: autotools.eclass
15 ===================================================================
16 RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v
17 retrieving revision 1.116
18 retrieving revision 1.117
19 diff -u -r1.116 -r1.117
20 --- autotools.eclass 14 Dec 2011 20:46:36 -0000 1.116
21 +++ autotools.eclass 4 Jan 2012 22:00:27 -0000 1.117
22 @@ -1,6 +1,6 @@
23 # Copyright 1999-2011 Gentoo Foundation
24 # Distributed under the terms of the GNU General Public License v2
25 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.116 2011/12/14 20:46:36 vapier Exp $
26 +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.117 2012/01/04 22:00:27 vapier Exp $
27
28 # @ECLASS: autotools.eclass
29 # @MAINTAINER:
30 @@ -256,14 +256,12 @@
31
32 # Run automake if:
33 # - a Makefile.am type file exists
34 - # - a Makefile.in type file exists and the configure
35 - # script is using the AM_INIT_AUTOMAKE directive
36 - for makefile_name in {GNUmakefile,{M,m}akefile}.{am,in} "" ; do
37 + # - the configure script is using the AM_INIT_AUTOMAKE directive
38 + for makefile_name in {GNUmakefile,{M,m}akefile}.am "" ; do
39 [[ -f ${makefile_name} ]] && break
40 done
41 - [[ -z ${makefile_name} ]] && return 0
42
43 - if [[ ${makefile_name} == *.in ]] ; then
44 + if [[ -z ${makefile_name} ]] ; then
45 if ! grep -qs AM_INIT_AUTOMAKE configure.?? ; then
46 return 0
47 fi