diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/autotools.eclass | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 0c7100dcc188..d4dc9d5e628b 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1506 2015/01/12 21:24:40 haubi Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1507 2015/01/12 23:17:14 polynomial-c Exp $ + + 12 Jan 2015; Lars Wendler <polynomial-c@gentoo.org> autotools.eclass: + Attempt to fix bug #536428. 12 Jan 2015; Michael Haubenwallner <haubi@gentoo.org> +ELT-patches/aixrtl/2.4.4-with-svr4: diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index fce85dd68872..5df3216e5c10 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.172 2015/01/12 14:21:17 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.173 2015/01/12 23:17:14 polynomial-c Exp $ # @ECLASS: autotools.eclass # @MAINTAINER: @@ -222,7 +222,11 @@ eautoreconf() { done ${rerun_aclocal} && eaclocal - eautoconf --force + if [[ ${WANT_AUTOCONF} = 2.1 ]] ; then + eautoconf + else + eautoconf --force + fi eautoheader [[ ${AT_NOEAUTOMAKE} != "yes" ]] && FROM_EAUTORECONF="yes" eautomake ${AM_OPTS} |