summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2011-08-20 07:28:13 +0000
committerEray Aslan <eras@gentoo.org>2011-08-20 07:28:13 +0000
commit4f8b909d3d3bcb4402857ca7eb2dffcbe6f813ef (patch)
tree80b7bd6f923be3fdb81ca1893df15029b81ba3a2 /net-mail/vpopmail
parentUse Python 2. Don't install *.pyc, *.pyo, *.a and *.la files in Python site-p... (diff)
downloadgentoo-2-4f8b909d3d3bcb4402857ca7eb2dffcbe6f813ef.tar.gz
gentoo-2-4f8b909d3d3bcb4402857ca7eb2dffcbe6f813ef.tar.bz2
gentoo-2-4f8b909d3d3bcb4402857ca7eb2dffcbe6f813ef.zip
Add mysql incdir to configure script - bug #379813
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'net-mail/vpopmail')
-rw-r--r--net-mail/vpopmail/ChangeLog5
-rw-r--r--net-mail/vpopmail/vpopmail-5.4.33.ebuild18
2 files changed, 14 insertions, 9 deletions
diff --git a/net-mail/vpopmail/ChangeLog b/net-mail/vpopmail/ChangeLog
index 05b0ec17986b..b0c871319464 100644
--- a/net-mail/vpopmail/ChangeLog
+++ b/net-mail/vpopmail/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-mail/vpopmail
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.103 2011/08/09 13:02:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/ChangeLog,v 1.104 2011/08/20 07:28:13 eras Exp $
+
+ 20 Aug 2011; Eray Aslan <eras@gentoo.org> vpopmail-5.4.33.ebuild:
+ Add mysql incdir to configure script - bug #379813
09 Aug 2011; Kacper Kowalik <xarthisius@gentoo.org> vpopmail-5.4.33.ebuild:
ppc/ppc64 stable wrt #378371
diff --git a/net-mail/vpopmail/vpopmail-5.4.33.ebuild b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
index 22c2ef5378cb..05c88cb0dffc 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.33.ebuild,v 1.2 2011/08/09 13:02:04 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/vpopmail/vpopmail-5.4.33.ebuild,v 1.3 2011/08/20 07:28:13 eras Exp $
EAPI=4
@@ -65,14 +65,16 @@ src_prepare() {
src_configure() {
vpopmail_set_homedir
+ local authopts
if use mysql; then
- authopts=" \
- --enable-auth-module=mysql \
- --enable-libdir=/usr/lib/mysql \
- --enable-sql-logging \
- --enable-valias \
- --disable-mysql-replication \
- --enable-mysql-limits"
+ authopts="$(mysql_config --include)"
+ authopts="--enable-incdir=${authopts#-I}"
+ authopts+=" --enable-auth-module=mysql"
+ authopts+=" --enable-libdir=/usr/$(get_libdir)/mysql"
+ authopts+=" --enable-sql-logging"
+ authopts+=" --enable-valias"
+ authopts+=" --disable-mysql-replication"
+ authopts+=" --enable-mysql-limits"
else
authopts="--enable-auth-module=cdb"
fi