Add mysql incdir to configure script - bug #379813

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

diff --git a/net-mail/vpopmail/ChangeLog b/net-mail/vpopmail/ChangeLog
index 05b0ec17986be5fa2f7e4895d337c778eeaeaf9c..b0c8713194643a49a27201de235f89fc957e3580 100644 (file)
--- 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/Manifest b/net-mail/vpopmail/Manifest
index 3eaf3941966877173ec8d8bf5cd898ae52d579a8..dd3b7485f48a75e827c907b0a2be66fa7d1d2e44 100644 (file)
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -12,15 +12,23 @@ DIST vpopmail-5.4.33.tar.gz 612271 RMD160 d064f1a53e7cbe41c87af790ab2dee2d406df7
 EBUILD vpopmail-5.4.16.ebuild 7578 RMD160 7541f90ccc8f24e7ed50d67f0c7f64c148296063 SHA1 4a9caded00f83d85dcbbec4d6e4d9cc390884273 SHA256 446d852b65028132f03477f7b4856769017ca90e4193f15bcdf8a34f9b8f54a0
 EBUILD vpopmail-5.4.30-r1.ebuild 7223 RMD160 f259a46d87aaa25a6530b6be28a7da8d895ce40b SHA1 9fda6c094eda6d85b36d2979c2a727dc7e858963 SHA256 649f14ccca8a66dceb13f27df4acfa4dd7e7ccb1f009716ca2ed008e4b1ee415
 EBUILD vpopmail-5.4.30-r2.ebuild 7324 RMD160 615b37cd3af0049d40636a11a79f21bdaef68a73 SHA1 8c14bb5d42ebe14c25a61fe24c3daa7357a8f146 SHA256 ac748c1eb9fdbf5cf165a18afa26c1cdd70daab16d87dbf5a7a70b78f17aa45d
-EBUILD vpopmail-5.4.33.ebuild 7231 RMD160 18a17b959394e4d10dcfb5e51212cfc7506b7f25 SHA1 13240aa5aff83a267d6d1224ec6885176d6ffe82 SHA256 61b9149dfdb062dcc2ddbede775b67889adbb39044bd6e38213f58b641f1a5f5
-MISC ChangeLog 16006 RMD160 9d919092aa339b1afea1d636b81110a73cc52fb7 SHA1 e0ba7ed5cb71782f063bd3b6e967f19acb10573d SHA256 bd2c851780b45210a96ddcbaa0bd821591fef6a38e3f3c18d0ba372b54326225
+EBUILD vpopmail-5.4.33.ebuild 7380 RMD160 c1973f6fafe86ff14d3f32f37e49059672f7b503 SHA1 af71b526ac9ff95f81183722fe8af1d58e64805a SHA256 b03f95e5ad55e0685e8f668fa2434b09f5184d069a5ee8383842858421a109fa
+MISC ChangeLog 16122 RMD160 6b8c885d63d4e7ee4db06c2d71927d7d4074b081 SHA1 5ce6592bc7b74493b1e16b80375e4d75baddaac4 SHA256 3a69da2a724ff4724b73a7a74f4ca6676a478a0838b5f3e51804cff12487d360
 MISC metadata.xml 517 RMD160 3ac125856ecc0b4a40da3121250fe0ae5e6d74c8 SHA1 2f0e78d2e5e00498860b9d72bdb4b66883370c55 SHA256 d651b3c6eb2a45f76ffd4546a77248df9f5750e9acd14b4896d3cac0bec65c88
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk5BL9IACgkQIiMqcbOVdxSotAP+LjCZ5lb4AVPLu6lSQPdErBph
-8gD3hFvqlyn/KHqnNcK9am4wlhxtx6a+BZGaUKcPv6SrkfaHPJva4O+/9ZK8y7NN
-qF//aIQHsZMVHqa50TVdQ98TGsFHZY19IxmC+Vl4Yphr78yeZ4tnPDTvBD06HjUM
-njo8j5Z/YxAifQlOmJw=
-=Wdyk
+iQIcBAEBCAAGBQJOT2IbAAoJEHfx8XVYajsfXKEP/0sXq01xRWOQhzGWTb9tKK1t
+e5YaL30nDHwsRO3Zo9q3Pd6avOeJ1znFfDZMppmPMIwySu8wUpa3Uhdxc2diqp1H
+ay0JV6oWAF2bZDizZZ/Onbh8rGJ4EOIv6TdyIFccgJ4LWSNu+0zkV2ycpHoUKYCi
+GrjRZCAdmVnxRUDJQKzjAlW+dwQGmrzp5/Fja/NX8lsEaNDd8v3EfLIMxuAGdHG8
+I1r0SI5uRkETrREQVYhpn7oiNsO4Ohd0Ml5xAGJDgdvStRITy50jtfl8lXU/p2PR
+ZWIeSnbqgpXkGPKlywM00xWoCGYCtqNNty8GwpjXZPJV+NykgImtuCE0mqpnvhl/
+ywnMVp2WAcOwzs29dWPmTP7I1M74aR3IbrWIm/jZivQQnoVu7AO0Svda98rpDd0d
+4caKjcx2lJPsQBu6hIgVJu0p0WIQp+4gNQ/v6NgkpZqEhhJYpL68MRjtPNACsIoA
+zMTqbhzFZhrSmryIW1pZZtHPaG5MP1rMaxRxF5Hu+YYRuyAdcLF2jX9EqsGyTsWk
+m1awUUQBQdb6Th3nUVt30zOg/XvbO7AVp37y6XsRY9VxxwiOp1wVQpifYEBv3TVP
+Ng0vsdlsD68DjLEgzTnP9om4b5L5m0SGicK60on+NSBr+4XhUfAkLEk0oTktS5oJ
+6LSxj0l1rYXyAqCbTkMF
+=eS2g
 -----END PGP SIGNATURE-----

diff --git a/net-mail/vpopmail/vpopmail-5.4.33.ebuild b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
index 22c2ef5378cbfea814baedefb337951f4221c311..05c88cb0dffc1cf1cb98b7798ff932b06188d26d 100644 (file)
--- 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