--- /usr/portage/dev-db/mysql/mysql-4.1.13-r1.ebuild	2005-08-18 03:05:32.000000000 +0200
+++ mysql-4.1.13-r1.ebuild	2005-08-20 10:43:11.000000000 +0200
@@ -169,9 +169,18 @@
 	use readline && myconf="${myconf} --without-readline"
 	use readline || myconf="${myconf} --with-readline"
 
-	use static \
-		&& myconf="${myconf} --with-mysqld-ldflags=-all-static --disable-shared" \
-		|| myconf="${myconf} --enable-shared --enable-static"
+	if useq mysql-static-daemon ; then
+		myconf="${myconf} --with-mysqld-ldflags=-all-static"
+		myconf="${myconf} --enable-shared --enable-static"
+	else
+		if useq static ; then
+			myconf="${myconf} --with-mysqld-ldflags=-all-static"
+			myconf="${myconf} --with-client-ldflags=-all-static"
+			myconf="${myconf} --disable-shared"
+		else
+			myconf="${myconf} --enable-shared --enable-static"
+		fi
+	fi
 
 	myconf="${myconf} `use_with tcpd libwrap`"