summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2012-01-14 15:18:05 +0000
committerMichał Górny <mgorny@gentoo.org>2012-01-14 15:18:05 +0000
commit50469a596cb49249d24be00597d0d9ed1d9a0ffc (patch)
treef5d2664b788c1f6f28fd0a5986a01b814001ca19
parentAutoreconfigure packages when user patches need it. (diff)
downloadhistorical-50469a596cb49249d24be00597d0d9ed1d9a0ffc.tar.gz
historical-50469a596cb49249d24be00597d0d9ed1d9a0ffc.tar.bz2
historical-50469a596cb49249d24be00597d0d9ed1d9a0ffc.zip
Pass --force to eautopoint and few other pre-autoreconf funcs.
-rw-r--r--eclass/ChangeLog5
-rw-r--r--eclass/autotools-utils.eclass8
2 files changed, 8 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index ff19cbf07749..dac8d48ab6fb 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.82 2012/01/14 14:59:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.83 2012/01/14 15:18:05 mgorny Exp $
+
+ 14 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
+ Pass --force to eautopoint and few other pre-autoreconf funcs.
14 Jan 2012; Michał Górny <mgorny@gentoo.org> autotools-utils.eclass:
Autoreconfigure packages when user patches need it.
diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass
index 84d2b80be18e..3e1b539c0595 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.37 2012/01/14 14:59:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools-utils.eclass,v 1.38 2012/01/14 15:18:05 mgorny Exp $
# @ECLASS: autotools-utils.eclass
# @MAINTAINER:
@@ -307,13 +307,13 @@ autotools-utils_autoreconf() {
if [[ $(autotools_check_macro AM_GLIB_GNU_GETTEXT) ]]; then
echo 'no' | autotools_run_tool glib-gettextize --copy
elif [[ $(autotools_check_macro AM_GNU_GETTEXT) ]]; then
- eautopoint
+ eautopoint --force
fi
# intltool
if [[ $(autotools_check_macro AC_PROG_INTLTOOL IT_PROG_INTLTOOL) ]]
then
- autotools_run_tool intltoolize --copy --automake
+ autotools_run_tool intltoolize --copy --automake --force
fi
# gtk-doc
@@ -323,7 +323,7 @@ autotools-utils_autoreconf() {
# gnome-doc
if [[ $(autotools_check_macro GNOME_DOC_INIT) ]]; then
- autotools_run_tool gnome-doc-prepare --copy
+ autotools_run_tool gnome-doc-prepare --copy --force
fi
# We need to perform the check twice to know whether to run eaclocal.