diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2012-02-12 00:20:54 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2012-02-12 00:20:54 +0000 |
| commit | f640c571ee29c05b8bf598d38fe69699f3ecf34a (patch) | |
| tree | ca59c8bd17a8f634fec9d13f2814516a2c6a35ce /eclass | |
| parent | Marked stable on PPC64 as requested by Dirkjan "djc" Ochtman in bug #386089. ... (diff) | |
| download | gentoo-2-f640c571ee29c05b8bf598d38fe69699f3ecf34a.tar.gz gentoo-2-f640c571ee29c05b8bf598d38fe69699f3ecf34a.tar.bz2 gentoo-2-f640c571ee29c05b8bf598d38fe69699f3ecf34a.zip | |
Provide a way to run eautoreconf without automake by using WANT_AUTOMAKE=none.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/autotools.eclass | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index dd5759e868dd..835bc10b84ce 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.127 2012/02/11 20:44:40 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.128 2012/02/12 00:20:54 robbat2 Exp $ + + 12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> autotools.eclass: + Provide a way to run eautoreconf without automake by using + WANT_AUTOMAKE=none. 11 Feb 2012; Christian Ruppert <idl0r@gentoo.org> vdr-plugin.eclass: Remove vdr_add_local_patch() and use epatch_user() from eutils instead. Issue diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 62662fd74b71..1949b9f32439 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# 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.118 2012/01/06 21:06:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.119 2012/02/12 00:20:54 robbat2 Exp $ # @ECLASS: autotools.eclass # @MAINTAINER: @@ -254,6 +254,12 @@ eautomake() { local extra_opts local makefile_name + # Some packages might need to skip automake + # OpenLDAP is a good example. It does not use automake (all the .in files are + # handwritten), but it does AM_INIT_AUTOMAKE in configure.in, for all the + # other macros involved + [[ ${WANT_AUTOMAKE} == "none" ]] && return 0 + # Run automake if: # - a Makefile.am type file exists # - the configure script is using the AM_INIT_AUTOMAKE directive |