From: Luca Longinotti <chtekk@gentoo.org>
Date: Tue, 6 Mar 2007 15:55:55 +0000 (+0000)
Subject: Fix libtool bug in the right place.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f31c213f61828c6737ae8c2de0c395eff44a2e01;p=gentoo.git

Fix libtool bug in the right place.
---

diff --git a/eclass/mysql.eclass b/eclass/mysql.eclass
index 0ae73bdcd86e..4698b464a88a 100644
--- a/eclass/mysql.eclass
+++ b/eclass/mysql.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.70 2007/01/12 23:33:19 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/mysql.eclass,v 1.71 2007/03/06 15:55:55 chtekk Exp $
 
 # Author: Francesco Riosa (Retired) <vivo@gentoo.org>
 # Maintainer: Luca Longinotti <chtekk@gentoo.org>
@@ -543,10 +543,11 @@ mysql_src_unpack() {
 	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"
-		pushd "bdb/dist" \
-		&& sh s_all \
-		|| die "Failed bdb reconfigure" \
-		&>/dev/null
+		cp -f "/usr/share/aclocal/libtool.m4" "bdb/dist/aclocal/libtool.ac" \
+		|| die "Could not copy libtool.m4 to bdb/dist/"
+		pushd "bdb/dist" &>/dev/null
+		sh s_all \
+		|| die "Failed bdb reconfigure"
 		popd &>/dev/null
 	fi
 }