summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2012-02-12 19:24:32 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2012-02-12 19:24:32 +0000
commit99bcb01a21b5206f7d604f632354e88456268f22 (patch)
tree277b2e3f5a31ad5a5bc22b7b7809a53d7e9c554a /net-nds/openldap/openldap-2.4.21.ebuild
parentAdded patch that makes suhosin build with php[threads]. Bug 400889 (diff)
downloadgentoo-2-99bcb01a21b5206f7d604f632354e88456268f22.tar.gz
gentoo-2-99bcb01a21b5206f7d604f632354e88456268f22.tar.bz2
gentoo-2-99bcb01a21b5206f7d604f632354e88456268f22.zip
Bug #403261: no direct automake need, but OpenLDAP still needs a specific version of aclocal which comes from automake
(Portage version: 2.2.0_alpha85/cvs/Linux x86_64)
Diffstat (limited to 'net-nds/openldap/openldap-2.4.21.ebuild')
-rw-r--r--net-nds/openldap/openldap-2.4.21.ebuild8
1 files changed, 3 insertions, 5 deletions
diff --git a/net-nds/openldap/openldap-2.4.21.ebuild b/net-nds/openldap/openldap-2.4.21.ebuild
index a2e45619fd82..3b99d671d49f 100644
--- a/net-nds/openldap/openldap-2.4.21.ebuild
+++ b/net-nds/openldap/openldap-2.4.21.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.21.ebuild,v 1.4 2012/02/12 00:54:14 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/openldap-2.4.21.ebuild,v 1.5 2012/02/12 19:24:32 robbat2 Exp $
EAPI="2"
-WANT_AUTOMAKE=none
+WANT_AUTOMAKE=1.9
inherit db-use eutils flag-o-matic multilib ssl-cert versionator toolchain-funcs autotools
DESCRIPTION="LDAP suite of application and development tools"
@@ -253,9 +253,7 @@ src_prepare() {
"${S}"/tests/scripts/* || die "sed failed"
cd "${S}"
- #sed '/AM_INIT_AUTOMAKE/s,^,#,g' -i configure.in || die "sed failed"
- eautoreconf
- #sed '/AM_INIT_AUTOMAKE/s,^#,,g' -i configure.in || die "sed failed"
+ WANT_AUTOMAKE=none eautoreconf
}
build_contrib_module() {