diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-03-28 08:11:46 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-03-28 08:11:46 +0000 |
| commit | 1eda0ca0bd43abfb6a64d09c9b4b47f8b225bdb5 (patch) | |
| tree | 10172c09753356d8fd90fe9cfc22b4a129974e1f /eclass | |
| parent | update default anon cvs server (diff) | |
| download | gentoo-2-1eda0ca0bd43abfb6a64d09c9b4b47f8b225bdb5.tar.gz gentoo-2-1eda0ca0bd43abfb6a64d09c9b4b47f8b225bdb5.tar.bz2 gentoo-2-1eda0ca0bd43abfb6a64d09c9b4b47f8b225bdb5.zip | |
Check also for AM_PROG_LIBTOOL before ignoring libtoolize step.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/autotools.eclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass index 29f15f823f90..6928f4ad5369 100644 --- a/eclass/autotools.eclass +++ b/eclass/autotools.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.33 2006/03/19 22:35:50 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.34 2006/03/28 08:11:46 flameeyes Exp $ # # Author: Diego Pettenò <flameeyes@gentoo.org> # Enhancements: Martin Schlemmer <azarah@gentoo.org> @@ -109,9 +109,12 @@ eaclocal() { _elibtoolize() { local opts + local lttest - # Check if we should run libtoolize - [[ -n $(autotools_check_macro "AC_PROG_LIBTOOL") ]] || return 0 + # Check if we should run libtoolize (AM_PROG_LIBTOOL is an older macro, + # check for both it and the current AC_PROG_LIBTOOL) + lttest="$(autotools_check_macro "AC_PROG_LIBTOOL")$(autotools_check_macro "AM_PROG_LIBTOOL")" + [[ -n $lttest ]] || return 0 [[ -f Makefile.am ]] && opts="--automake" |