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

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

commit:     c90d731df39a9970030d494c3e524f31514c0f36
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  1 19:00:41 2011 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec  1 19:00:41 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=c90d731d

autotools-utils: rewrite some more autotools code to make it faster.

Now we don't run aclocal multiple times, and we don't need to call
autoconf to check for various macros. Of course, there is a number of
corner cases where we will fail terribly.

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

diff --git a/eclass/autotools-utils.eclass b/eclass/autotools-utils.eclass
index 71b0bfc..54b7d6e 100644
--- a/eclass/autotools-utils.eclass
+++ b/eclass/autotools-utils.eclass
@@ -274,14 +274,26 @@ remove_libtool_files() {
 autotools-utils_autoreconf() {
 	debug-print-function ${FUNCNAME} "$@"
 
-	einfo "Autoreconfiguring '${PWD}' ..."
+	# Override this func to not require unnecessary eaclocal calls.
+	autotools_check_macro() {
+		local x
+
+		# Add a few additional variants as we don't get expansions.
+		[[ ${1} = AC_CONFIG_HEADERS ]] && set -- "${@}" AC_CONFIG_HEADER
 
-	local auxdir=$(autotools_get_auxdir)
-	[[ ${auxdir} ]] && mkdir -p ${auxdir}
+		for x; do
+			grep -h "^${x}" configure.{ac,in} 2>/dev/null
+		done
+	}
+
+	einfo "Autoreconfiguring '${PWD}' ..."
 
-	# XXX: avoid calling this twice somehow...
-	eaclocal
-	_elibtoolize --copy --force --install
+	local auxdir=$(sed -n -e 's/^AC_CONFIG_AUX_DIR(\(.*\))$/\1/p' \
+			configure.{ac,in} 2>/dev/null)
+	if [[ ${auxdir} ]]; then
+		auxdir=${auxdir%%]}
+		mkdir -p ${auxdir##[}
+	fi
 
 	# Support running additional tools like gnome-autogen.sh.
 	# Note: you need to add additional depends to the ebuild.
@@ -309,6 +321,15 @@ autotools-utils_autoreconf() {
 		autotools_run_tool gnome-doc-prepare --copy
 	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
+
 	eautoconf
 	eautoheader
 	eautomake