From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RXU4j-0003iI-LW for garchives@archives.gentoo.org; Mon, 05 Dec 2011 08:39:01 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93CD921C034; Mon, 5 Dec 2011 08:38:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6551C21C039 for ; Mon, 5 Dec 2011 08:38:28 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DFE581B402A for ; Mon, 5 Dec 2011 08:38:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6590880044 for ; Mon, 5 Dec 2011 08:38:27 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <956819d793ccbbd943343c8b55b241e210048d92.mgorny@gentoo> Subject: [gentoo-commits] dev/mgorny:master commit in: eclass/ X-VCS-Repository: dev/mgorny X-VCS-Files: eclass/autotools-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 956819d793ccbbd943343c8b55b241e210048d92 Date: Mon, 5 Dec 2011 08:38:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 10a3fa96-85c0-4d4d-ad62-7a8e8715bae2 X-Archives-Hash: 85f1ca7622da322037a28fc903fa5388 commit: 956819d793ccbbd943343c8b55b241e210048d92 Author: Micha=C5=82 G=C3=B3rny gentoo org> AuthorDate: Wed Nov 30 22:20:33 2011 +0000 Commit: Micha=C5=82 G=C3=B3rny gentoo org> CommitDate: Wed Nov 30 23:16:41 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/mgorny.git;a=3D= commit;h=3D956819d7 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.eclas= s 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} "$@" =20 - # Support running additional tools like gnome-autogen.sh. - # Note: you need to add additional depends to the ebuild. + einfo "Autoreconfiguring '${PWD}' ..." + + local auxdir=3D$(autotools_get_auxdir) + [[ ${auxdir} ]] && mkdir -p ${auxdir} =20 - # 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. =20 # gettext if [[ $(autotools_check_macro AM_GLIB_GNU_GETTEXT) ]]; then @@ -289,7 +294,8 @@ autotools-utils_autoreconf() { fi =20 # intltool - if [[ $(autotools_check_macro AC_PROG_INTLTOOL IT_PROG_INTLTOOL) ]]; th= en + if [[ $(autotools_check_macro AC_PROG_INTLTOOL IT_PROG_INTLTOOL) ]] + then autotools_run_tool intltoolize --copy --automake fi =20 @@ -303,7 +309,18 @@ autotools-utils_autoreconf() { autotools_run_tool gnome-doc-prepare --copy fi =20 - 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 } =20 # @FUNCTION: autotools-utils_src_prepare