--- /usr/portage/eclass/php5-sapi.eclass	2005-02-03 22:36:49.000000000 +0100
+++ /usr/local/portage/eclass/php5-sapi.eclass	2005-02-07 18:40:31.445677920 +0100
@@ -107,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
@@ -229,12 +219,16 @@
 		enable_extension_with		"solid"			"solid"			1
 	fi

-	if useq mysql; then
-		enable_extension_with		"mysql"			"mysql"			1
-		enable_extension_with		"mysql-sock"	"mysql"			0 "/var/run/mysqld/mysqld.sock"
-	fi
 	if useq mysqli; then
-		enable_extension_with		"mysqli"		"mysqli"		1
+		if useq mysql; then
+			enable_extension_with       "mysql"         "mysql"		0 "/usr/bin/mysql_config"
+			enable_extension_disable    "embedded-mysqli" "embedded-mysqli" 0
+			enable_extension_with       "mysql-sock"    "mysql"     0 "/var/run/mysqld/mysqld.sock"
+		fi
+		enable_extension_with		"mysqli"		"mysqli"		1 "/usr/bin/mysql_config"
+	elif useq mysql; then
+		enable_extension_with       "mysql"         "mysql"			1
+		enable_extension_with       "mysql-sock"    "mysql"         0 "/var/run/mysqld/mysqld.sock"
 	fi

 	# QDBM doesn't play nicely with GDBM _or_ DBM