Fix libtool bug in the right place.
authorLuca Longinotti <chtekk@gentoo.org>
Tue, 6 Mar 2007 15:55:55 +0000 (15:55 +0000)
committerLuca Longinotti <chtekk@gentoo.org>
Tue, 6 Mar 2007 15:55:55 +0000 (15:55 +0000)
eclass/mysql.eclass

index 0ae73bdcd86e42f7bf9205532e23e93e0b3b2bbc..4698b464a88a183c0d9f854fadd23b2aae861a0c 100644 (file)
@@ -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
 }