diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2012-02-20 02:54:21 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2012-02-20 02:54:21 +0000 |
| commit | 0be3cc8e07c50b0b94e4d0202c1693678038684f (patch) | |
| tree | 91bc6473d6015c92443fafb5e6d48c9e5fe09551 /eclass/autotools.eclass | |
| parent | Re-do init script. (diff) | |
| download | gentoo-2-0be3cc8e07c50b0b94e4d0202c1693678038684f.tar.gz gentoo-2-0be3cc8e07c50b0b94e4d0202c1693678038684f.tar.bz2 gentoo-2-0be3cc8e07c50b0b94e4d0202c1693678038684f.zip | |
Remove my WANT_AUTOMAKE=none overloading in eautomake and instead introduce AT_NOEACLOCAL, AT_NOEAUTOCONF, AT_NOEAUTOMAKE that work the same as AT_NOELIBTOOLIZE. Should fix bug #404555.
Diffstat (limited to 'eclass/autotools.eclass')
| -rw-r--r-- | eclass/autotools.eclass | 43 |
1 files changed, 30 insertions, 13 deletions
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 63ae0c4bbd5e..6e16ab0a2d61 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.121 2012/02/13 17:26:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.122 2012/02/20 02:54:21 robbat2 Exp $ # @ECLASS: autotools.eclass # @MAINTAINER: @@ -98,6 +98,27 @@ unset _automake_atom _autoconf_atom # Additional options to pass to automake during # eautoreconf call. +# @ECLASS-VARIABLE: AT_NOEACLOCAL +# @DEFAULT_UNSET +# @DESCRIPTION: +# Don't run eaclocal command if set to 'yes', +# useful when eaclocal needs to be ran with +# particular options + +# @ECLASS-VARIABLE: AT_NOEAUTOCONF +# @DEFAULT_UNSET +# @DESCRIPTION: +# Don't run eautoconf command if set to 'yes', +# useful when eautoconf needs to be ran with +# particular options + +# @ECLASS-VARIABLE: AT_NOEAUTOMAKE +# @DEFAULT_UNSET +# @DESCRIPTION: +# Don't run eautomake command if set to 'yes', +# useful when eautomake needs to be ran with +# particular options + # @ECLASS-VARIABLE: AT_NOELIBTOOLIZE # @DEFAULT_UNSET # @DESCRIPTION: @@ -142,18 +163,20 @@ eautoreconf() { auxdir=$(autotools_get_auxdir) - einfo "Running eautoreconf in '${PWD}' ..." - [[ -n ${auxdir} ]] && mkdir -p ${auxdir} - eaclocal + if [[ ${AT_NOEACLOCAL} != "yes" ]]; then + einfo "Running eautoreconf in '${PWD}' ..." + [[ -n ${auxdir} ]] && mkdir -p ${auxdir} + eaclocal + fi [[ ${CHOST} == *-darwin* ]] && g=g if ${LIBTOOLIZE:-${g}libtoolize} -n --install >& /dev/null ; then _elibtoolize --copy --force --install else _elibtoolize --copy --force fi - eautoconf - eautoheader - FROM_EAUTORECONF="yes" eautomake ${AM_OPTS} + [[ ${AT_NOEAUTOCONF} != "yes" ]] && eautoconf + [[ ${AT_NOEAUTOHEADER} != "yes" ]] && eautoheader + [[ ${AT_NOEAUTOMAKE} != "yes" ]] && FROM_EAUTORECONF="yes" eautomake ${AM_OPTS} [[ ${AT_NOELIBTOOLIZE} == "yes" ]] && return 0 @@ -254,12 +277,6 @@ 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 |