--- php5-sapi.eclass.orig	2004-11-16 05:08:23.000000000 -0500
+++ php5-sapi.eclass	2004-11-22 15:29:36.652603504 -0500
@@ -48,6 +48,7 @@
 	ming? ( media-libs/ming )
 	mssql? ( dev-db/freetds )
 	mysql? ( >=dev-db/mysql-3.23.26 )
+	mysqli? ( >=dev-db/mysql-4.1.3 )
 	ncurses? ( sys-libs/ncurses )
 	nls? ( sys-devel/gettext )
 	odbc? ( >=dev-db/unixODBC-1.8.13 )
@@ -106,16 +107,6 @@
 
 php5-sapi_check_awkward_uses () {
 
-	# mysqli support isn't possible yet
-
-	if useq mysqli ; then
-		eerror
-		eerror "We currently do not support the mysqli extension"
-		eerror "Support will be added once MySQL 4.1 has been added to Portage"
-		eerror
-		die "mysqli not supported yet"
-	fi
-
 	# recode not available in 5.0.0; upstream bug
 	if useq recode && [ "$PV" == "5.0.0" ]; then
 		eerror
@@ -219,10 +210,13 @@
 	fi
 
 	if useq mysql ; then
-		enable_extension_with		"mysql"			"mysql"			1
+		enable_extension_with		"mysql"			"mysql"		0 "/usr/bin/mysql_config"
 		enable_extension_with		"mysql-sock"	"mysql"			0 "/var/run/mysqld/mysqld.sock"
-	else
-		enable_extension_with		"mysqli"		"mysqli"			1
+	
+	fi
+
+	if useq mysqli; then
+		enable_extension_with		"mysqli"		"mysqli"	0 "/usr/bin/mysql_config"
 	fi
 
 	# QDBM doesn't play nicely with GDBM _or_ DBM
@@ -264,9 +258,6 @@
 	# ldap support
 	confutils_use_depend_all "sasl" "ldap"
 
-	# mysql support
-	confutils_use_conflict "mysqli" "mysql"
-
 	# odbc support
 	confutils_use_depend_all "adabas"		"odbc"
 	confutils_use_depend_all "birdstep"		"odbc"