summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2012-05-22 14:29:06 +0000
committerMichał Górny <mgorny@gentoo.org>2012-05-22 14:29:06 +0000
commit33cc51239859ea92993250d1f72e02dfaabe5721 (patch)
tree0dbff26a108a8640b7180b8507a67ee9a2c1e063 /eclass
parentChange order of USE="postproc" to || ( media-video/ffmpeg media-libs/libpostp... (diff)
downloadhistorical-33cc51239859ea92993250d1f72e02dfaabe5721.tar.gz
historical-33cc51239859ea92993250d1f72e02dfaabe5721.tar.bz2
historical-33cc51239859ea92993250d1f72e02dfaabe5721.zip
Call eaclocal unconditionally; _elibtoolize no longer does that.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/autotools-utils.eclass7
2 files changed, 6 insertions, 6 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 1f19d5c29ca4..edd97411e9aa 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.262 2012/05/22 13:41:59 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.263 2012/05/22 14:29:06 mgorny Exp $
+
+ 22 May 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ Call eaclocal unconditionally; _elibtoolize no longer does that.
22 May 2012; Davide Pesavento <pesa@gentoo.org> qt4-build.eclass:
Update SRC_URI for Qt 4.8.1 and later.
diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass
index 6a9c36a8a46c..490c08465e54 100644
--- a/eclass/autotools-utils.eclass
+++ b/eclass/autotools-utils.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-utils.eclass,v 1.49 2012/05/21 17:34:53 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.50 2012/05/22 14:29:06 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -327,15 +327,12 @@ autotools-utils_autoreconf() {
autotools_run_tool gnome-doc-prepare --copy --force
fi
- # We need to perform the check twice to know whether to run eaclocal.
- # (_elibtoolize does that itself)
if [[ $(autotools_check_macro AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT) ]]
then
_elibtoolize --copy --force --install
- else
- eaclocal
fi
+ eaclocal
eautoconf
eautoheader
FROM_EAUTORECONF=sure eautomake