--- mysql.eclass.orig	2008-05-31 09:30:23.000000000 +0200
+++ mysql.eclass	2008-07-04 22:45:18.000000000 +0200
@@ -587,10 +587,17 @@
 	if mysql_check_version_range "4.1 to 5.0.99.99" \
 	&& use berkdb ; then
 		[[ -w "bdb/dist/ltmain.sh" ]] && cp -f "ltmain.sh" "bdb/dist/ltmain.sh"
 		cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
 		|| die "Could not copy libtool.m4 to bdb/dist/"
+		#These files exist only with libtool-2*, and need to be included.
+		if [ -f '/usr/share/aclocal/ltsugar.m4' ]; then
+			cat "/usr/share/aclocal/ltsugar.m4" >>  "bdb/dist/aclocal/libtool.ac"
+			cat "/usr/share/aclocal/ltversion.m4" >>  "bdb/dist/aclocal/libtool.ac"
+			cat "/usr/share/aclocal/lt~obsolete.m4" >>  "bdb/dist/aclocal/libtool.ac"
+			cat "/usr/share/aclocal/ltoptions.m4" >>  "bdb/dist/aclocal/libtool.ac"
+		fi
 		pushd "bdb/dist" &>/dev/null
 		sh s_all \
 		|| die "Failed bdb reconfigure"
 		popd &>/dev/null
 	fi