diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-07-23 01:21:58 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-07-23 01:21:58 +0000 |
| commit | e34f9c9db8e91c11a8330c7b86fc3a81a2439a4e (patch) | |
| tree | ea493db1419305f2b71b9aefcb9dae959b3a2b06 /eclass/kde.eclass | |
| parent | Put this in kde herd, and force a newer admindir for compatibility with autoc... (diff) | |
| download | gentoo-2-e34f9c9db8e91c11a8330c7b86fc3a81a2439a4e.tar.gz gentoo-2-e34f9c9db8e91c11a8330c7b86fc3a81a2439a4e.tar.bz2 gentoo-2-e34f9c9db8e91c11a8330c7b86fc3a81a2439a4e.zip | |
Force automake 1.9 when using autoconf 2.60 for safety.
Diffstat (limited to 'eclass/kde.eclass')
| -rw-r--r-- | eclass/kde.eclass | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/eclass/kde.eclass b/eclass/kde.eclass index fbf921efa326..31622e875162 100644 --- a/eclass/kde.eclass +++ b/eclass/kde.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.173 2006/07/09 05:28:58 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde.eclass,v 1.174 2006/07/23 01:21:58 flameeyes Exp $ # # Author Dan Armak <danarmak@gentoo.org> # @@ -218,9 +218,17 @@ kde_src_compile() { # This is needed to fix building with autoconf 2.60. # Many thanks to who preferred such a stupid check rather # than a working arithmetic comparison. - [[ -f admin/cvs.sh ]] && + if [[ -f admin/cvs.sh ]]; then sed -i -e '/case $AUTO\(CONF\|HEADER\)_VERSION in/,+1 s/2\.5/2.[56]/g' \ admin/cvs.sh + fi + + # For some reasons, autoconf 2.60 throws up lots of warnings when using + # older versions of automake, so force automake 1.9 when using that + if [[ $(autoconf --version) == autoconf*2.60* ]]; then + einfo "Forcing automake 1.9 when using autoconf 2.60" + export WANT_AUTOMAKE="1.9" + fi # rebuild configure script, etc # This can happen with e.g. a cvs snapshot |