From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([69.77.167.62] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1K5dO7-00046N-OD for garchives@archives.gentoo.org; Mon, 09 Jun 2008 09:10:03 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03439E03D4; Mon, 9 Jun 2008 09:10:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D405BE03D4 for ; Mon, 9 Jun 2008 09:10:02 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 6B24965D94 for ; Mon, 9 Jun 2008 09:10:02 +0000 (UTC) Received: from vapier by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1K5dO2-0007fe-J5 for gentoo-commits@lists.gentoo.org; Mon, 09 Jun 2008 09:09:58 +0000 From: "Mike Frysinger (vapier)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vapier@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: autotools.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: autotools.eclass X-VCS-Directories: eclass X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger Content-Type: text/plain; charset=utf8 Message-Id: Sender: Mike Frysinger Date: Mon, 09 Jun 2008 09:09:58 +0000 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: 746c3e0b-c3fc-44dc-9f67-42ab2d4e6bc2 X-Archives-Hash: 7b948a61f7dca7e1730a9d14e2452234 vapier 08/06/09 09:09:58 Modified: autotools.eclass Log: allow autotools_check_macro to parse multiple arguments and add LT_INIT= to macro list to run libtoolize Revision Changes Path 1.77 eclass/autotools.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.e= class?rev=3D1.77&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.e= class?rev=3D1.77&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.e= class?r1=3D1.76&r2=3D1.77 Index: autotools.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- autotools.eclass 1 Jun 2008 01:43:06 -0000 1.76 +++ autotools.eclass 9 Jun 2008 09:09:58 -0000 1.77 @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.76 2008/0= 6/01 01:43:06 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.77 2008/0= 6/09 09:09:58 vapier Exp $ =20 # @ECLASS: autotools.eclass # @MAINTAINER: @@ -158,12 +158,10 @@ # libtool.eclass. _elibtoolize() { local opts - local lttest =20 # Check if we should run libtoolize (AM_PROG_LIBTOOL is an older macro, # check for both it and the current AC_PROG_LIBTOOL) - lttest=3D"$(autotools_check_macro "AC_PROG_LIBTOOL")$(autotools_check_m= acro "AM_PROG_LIBTOOL")" - [[ -n $lttest ]] || return 0 + [[ -n $(autotools_check_macro AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT) = ]] || return 0 =20 [[ -f GNUmakefile.am || -f Makefile.am ]] && opts=3D"--automake" =20 @@ -266,8 +264,11 @@ =20 # Internal function to check for support autotools_check_macro() { - [[ -f configure.ac || -f configure.in ]] && \ - WANT_AUTOCONF=3D"2.5" autoconf --trace=3D$1 2>/dev/null + [[ -f configure.ac || -f configure.in ]] || return 0 + local macro + for macro ; do + WANT_AUTOCONF=3D"2.5" autoconf --trace=3D"${macro}" 2>/dev/null + done return 0 } =20 --=20 gentoo-commits@lists.gentoo.org mailing list