--- dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild.orig	2004-06-18 16:25:12.000000000 +0200
+++ dev-libs/cyrus-sasl/cyrus-sasl-2.1.18.ebuild	2004-06-18 16:23:24.000000000 +0200
@@ -76,7 +76,17 @@
 	myconf="${myconf} `use_enable java` `use_with java javahome ${JAVA_HOME}`"
 
 	if [ "`use mysql`" -o "`use postgres`" ] ; then
-		myconf="${myconf} --enable-sql"
+		if [ "`use mysql`" -a "`use postgres`" ] ; then
+			echo
+			eerror "You have both mysql *AND* postgres in your USE flags."
+			eerror "For ${PN} to work correctly you have to disable at"
+			eerror "least one of them, e.g. like"
+			eerror "USE=\"-mysql\" emerge ${PN}"
+
+			die "Compilation of ${P} failed."
+		else
+			myconf="${myconf} --enable-sql"
+		fi
 	else
 		myconf="${myconf} --disable-sql"
 	fi
@@ -93,7 +103,7 @@
 	use mips && gnuconfig_update
 	use ppc64 && gnuconfig_update
 
-	econf \
+	CPPFLAGS="${CPPFLAGS} -I/usr/include/heimdal" econf \
 		--with-saslauthd=/var/lib/sasl2 \
 		--with-pwcheck=/var/lib/sasl2 \
 		--with-configdir=/etc/sasl2 \