From: Chris Larson <clarson@kergoth.com>
Date: Sat, 17 Jan 2004 03:40:39 +0000 (+0000)
Subject: Merge
X-Git-Tag: Release-2010-05/1~20329
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4aa0b4d5d3930257d8912be2a84ed9ea8cf9eae2;p=openembedded.git

Merge

2004/01/16 22:38:16-05:00 (none)!kergoth
BUGFIX: explicitly disable krb and gss support so as not to allow the configure script to look in /usr.

BKrev: 4008aeb79u9Th6ahLty2zw9YzPEdHA
---

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index bf35a0a504..80b045e3d1 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -5,6 +5,7 @@ kebert@geralt.doma
 kergoth@direwolf.(none)
 kergoth@direwolf.itg.ti.com
 kergoth@direwolf.ppp.ti.com
+kergoth@nexus.(none)
 kergoth@zelda.tuxnami.org
 mallum@shuttle.(none)
 mickey@allanon.vanille.de
diff --git a/cvs/cvs_1.11.6.oe b/cvs/cvs_1.11.6.oe
index ece1b60d91..5ba44e5d66 100644
--- a/cvs/cvs_1.11.6.oe
+++ b/cvs/cvs_1.11.6.oe
@@ -4,3 +4,5 @@ RDEPENDS = libc6
 SRC_URI := http://www.cvshome.org/files/19/10/${P}.tar.bz2
 
 inherit autotools
+
+EXTRA_OECONF = --with-krb4=no --with-gssapi=no
diff --git a/cvs/cvs_1.11.9.oe b/cvs/cvs_1.11.9.oe
index ece1b60d91..5ba44e5d66 100644
--- a/cvs/cvs_1.11.9.oe
+++ b/cvs/cvs_1.11.9.oe
@@ -4,3 +4,5 @@ RDEPENDS = libc6
 SRC_URI := http://www.cvshome.org/files/19/10/${P}.tar.bz2
 
 inherit autotools
+
+EXTRA_OECONF = --with-krb4=no --with-gssapi=no