| 1 |
vapier 08/06/09 09:09:58 |
| 2 |
|
| 3 |
Modified: autotools.eclass |
| 4 |
Log: |
| 5 |
allow autotools_check_macro to parse multiple arguments and add LT_INIT to macro list to run libtoolize |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.77 eclass/autotools.eclass |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.77&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?rev=1.77&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/autotools.eclass?r1=1.76&r2=1.77 |
| 13 |
|
| 14 |
Index: autotools.eclass |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v |
| 17 |
retrieving revision 1.76 |
| 18 |
retrieving revision 1.77 |
| 19 |
diff -u -r1.76 -r1.77 |
| 20 |
--- autotools.eclass 1 Jun 2008 01:43:06 -0000 1.76 |
| 21 |
+++ autotools.eclass 9 Jun 2008 09:09:58 -0000 1.77 |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
# Copyright 1999-2008 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.76 2008/06/01 01:43:06 vapier Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.77 2008/06/09 09:09:58 vapier Exp $ |
| 27 |
|
| 28 |
# @ECLASS: autotools.eclass |
| 29 |
# @MAINTAINER: |
| 30 |
@@ -158,12 +158,10 @@ |
| 31 |
# libtool.eclass. |
| 32 |
_elibtoolize() { |
| 33 |
local opts |
| 34 |
- local lttest |
| 35 |
|
| 36 |
# Check if we should run libtoolize (AM_PROG_LIBTOOL is an older macro, |
| 37 |
# check for both it and the current AC_PROG_LIBTOOL) |
| 38 |
- lttest="$(autotools_check_macro "AC_PROG_LIBTOOL")$(autotools_check_macro "AM_PROG_LIBTOOL")" |
| 39 |
- [[ -n $lttest ]] || return 0 |
| 40 |
+ [[ -n $(autotools_check_macro AC_PROG_LIBTOOL AM_PROG_LIBTOOL LT_INIT) ]] || return 0 |
| 41 |
|
| 42 |
[[ -f GNUmakefile.am || -f Makefile.am ]] && opts="--automake" |
| 43 |
|
| 44 |
@@ -266,8 +264,11 @@ |
| 45 |
|
| 46 |
# Internal function to check for support |
| 47 |
autotools_check_macro() { |
| 48 |
- [[ -f configure.ac || -f configure.in ]] && \ |
| 49 |
- WANT_AUTOCONF="2.5" autoconf --trace=$1 2>/dev/null |
| 50 |
+ [[ -f configure.ac || -f configure.in ]] || return 0 |
| 51 |
+ local macro |
| 52 |
+ for macro ; do |
| 53 |
+ WANT_AUTOCONF="2.5" autoconf --trace="${macro}" 2>/dev/null |
| 54 |
+ done |
| 55 |
return 0 |
| 56 |
} |
| 57 |
|
| 58 |
|
| 59 |
|
| 60 |
|
| 61 |
-- |
| 62 |
gentoo-commits@l.g.o mailing list |
Archives