[gentoo-commits] dev/mgorny:master commit in: eclass/

["Michał Górny" <mgorny@gentoo.org>]

commit:     956819d793ccbbd943343c8b55b241e210048d92
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 22:20:33 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 23:16:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=956819d7

Reimplement autoreconf from autotools.

---
 eclass/autotools-utils.eclass |   29 +++++++++++++++++++++++------
 1 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass
index 035d1de..71b0bfc 100644
--- a/eclass/autotools-utils.eclass
+++ b/eclass/autotools-utils.eclass
@@ -274,12 +274,17 @@ remove_libtool_files() {
 autotools-utils_autoreconf() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	# Support running additional tools like gnome-autogen.sh.
-	# Note: you need to add additional depends to the ebuild.
+	einfo "Autoreconfiguring '${PWD}' ..."
+
+	local auxdir=$(autotools_get_auxdir)
+	[[ ${auxdir} ]] && mkdir -p ${auxdir}
 
-	# aclocal is required to localize the macros
-	# XXX: do not call it twice...
+	# XXX: avoid calling this twice somehow...
 	eaclocal
+	_elibtoolize --copy --force --install
+
+	# Support running additional tools like gnome-autogen.sh.
+	# Note: you need to add additional depends to the ebuild.
 
 	# gettext
 	if [[ $(autotools_check_macro AM_GLIB_GNU_GETTEXT) ]]; then
@@ -289,7 +294,8 @@ autotools-utils_autoreconf() {
 	fi
 
 	# intltool
-	if [[ $(autotools_check_macro AC_PROG_INTLTOOL IT_PROG_INTLTOOL) ]]; then
+	if [[ $(autotools_check_macro AC_PROG_INTLTOOL IT_PROG_INTLTOOL) ]]
+	then
 		autotools_run_tool intltoolize --copy --automake
 	fi
 
@@ -303,7 +309,18 @@ autotools-utils_autoreconf() {
 		autotools_run_tool gnome-doc-prepare --copy
 	fi
 
-	eautoreconf
+	eautoconf
+	eautoheader
+	eautomake
+
+	local x
+	for x in $(autotools_get_subdirs); do
+		if [[ -d ${x} ]] ; then
+			pushd "${x}" >/dev/null
+			autotools-utils_eautoreconf
+			popd >/dev/null
+		fi
+	done
 }
 
 # @FUNCTION: autotools-utils_src_prepare