diff options
| author |   Chuck Short <zul@gentoo.org> | 2004-04-22 16:53:42 +0000 |
|---|---|---|
| committer | Chuck Short <zul@gentoo.org> | 2004-04-22 16:53:42 +0000 |
| commit | d0e46212fe04ae5d4f2bf6711791d4496520c962 (patch) | |
| tree | 65af87ca640e4b2da0dd51ff58fddca5059ec084 /app-admin/bacula | |
| parent | Marked 0.10.10 stable (x86) (Manifest recommit) (diff) | |
| download | gentoo-2-d0e46212fe04ae5d4f2bf6711791d4496520c962.tar.gz gentoo-2-d0e46212fe04ae5d4f2bf6711791d4496520c962.tar.bz2 gentoo-2-d0e46212fe04ae5d4f2bf6711791d4496520c962.zip | |
Force mysql to be used. Closes #47836.
Diffstat (limited to 'app-admin/bacula')
| -rw-r--r-- | app-admin/bacula/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/bacula/bacula-1.34.0.ebuild | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/app-admin/bacula/ChangeLog b/app-admin/bacula/ChangeLog index 2861008bfc2e..74adaa3b24d3 100644 --- a/app-admin/bacula/ChangeLog +++ b/app-admin/bacula/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/bacula # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/ChangeLog,v 1.23 2004/04/14 07:27:00 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/ChangeLog,v 1.24 2004/04/22 16:53:42 zul Exp $ + + 22 Apr 2004; Chuck Short <zul@gentoo.org> bacula-1.34.0.ebuild: + Force mysql to be used if sqlite and mysql are both in use flags. Closes + #47836. 14 Apr 2004; Daniel Ahlberg <aliz@gentoo.org> bacula-1.32f.ebuild: Removed S=, inherit eutils for epatch. diff --git a/app-admin/bacula/bacula-1.34.0.ebuild b/app-admin/bacula/bacula-1.34.0.ebuild index 77bcc644fdf8..f1162e11e148 100644 --- a/app-admin/bacula/bacula-1.34.0.ebuild +++ b/app-admin/bacula/bacula-1.34.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.34.0.ebuild,v 1.1 2004/04/13 16:29:23 zul Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/bacula/bacula-1.34.0.ebuild,v 1.2 2004/04/22 16:53:42 zul Exp $ DESCRIPTION="featureful client/server network backup suite" HOMEPAGE="http://www.bacula.org/" @@ -48,14 +48,10 @@ src_compile() { if use mysql then myconf="${myconf} --with-mysql=/usr" - fi - - if use sqlite + elif use sqlite then myconf="${myconf} --with-sqlite=/usr/include" - fi - - if use sqlite && use mysql && postgres + elif use sqlite && use mysql then myconf="${myconf/--with-sqlite/}" fi |