diff options
| author |   Nick Hadaway <raker@gentoo.org> | 2003-02-07 20:59:29 +0000 |
|---|---|---|
| committer | Nick Hadaway <raker@gentoo.org> | 2003-02-07 20:59:29 +0000 |
| commit | 9c3a56c057b4333a742278f8361ac1466e07d9fa (patch) | |
| tree | b019c6a95974863e5bb63e6b6484d4eeccda5777 /x11-libs | |
| parent | Added hppa to keywords. (diff) | |
| download | gentoo-2-9c3a56c057b4333a742278f8361ac1466e07d9fa.tar.gz gentoo-2-9c3a56c057b4333a742278f8361ac1466e07d9fa.tar.bz2 gentoo-2-9c3a56c057b4333a742278f8361ac1466e07d9fa.zip | |
enabled a workaround for odbc/gtk2 conflict.
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/wxGTK/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/wxGTK/wxGTK-2.4.0.ebuild | 15 |
2 files changed, 16 insertions, 5 deletions
diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog index 9a8dd7c34d9f..6fa0fa62c1e7 100644 --- a/x11-libs/wxGTK/ChangeLog +++ b/x11-libs/wxGTK/ChangeLog @@ -1,9 +1,13 @@ # ChangeLog for x11-libs/wxGTK # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.25 2003/01/22 03:22:32 raker Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.26 2003/02/07 20:59:29 raker Exp $ *wxGTK-2.4.0 (01 Jan 2003) + 04 Feb 2003; Nick Hadaway <raker@gentoo.org> wxGTK-2.4.0.ebuild : + If odbc and gtk2 are both specified, disable odbc and enable gtk2. + They are not compatible. + 21 Jan 2003; Nick Hadaway <raker@gentoo.org> wxGTK-2.4.0.ebuild : Changed to emake. diff --git a/x11-libs/wxGTK/wxGTK-2.4.0.ebuild b/x11-libs/wxGTK/wxGTK-2.4.0.ebuild index b4ccdac7343a..76a8b7c197ba 100644 --- a/x11-libs/wxGTK/wxGTK-2.4.0.ebuild +++ b/x11-libs/wxGTK/wxGTK-2.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.0.ebuild,v 1.5 2003/01/22 03:22:32 raker Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.4.0.ebuild,v 1.6 2003/02/07 20:59:29 raker Exp $ DESCRIPTION="GTK+ version of wxWindows, a cross-platform C++ GUI toolkit." SRC_URI="mirror://sourceforge/wxwindows/${P}.tar.bz2" @@ -50,9 +50,16 @@ src_compile() { && myconf="${myconf} --enable-static" \ || myconf="${myconf} --disable-static" - use odbc \ - && myconf="${myconf} --with-odbc" \ - || myconf="${myconf} --without-odbc" + if [ `use odbc` ] && [ ! `use gtk2` ]; then + myconf="${myconf} --with-odbc" + elif [ `use odbc` ] && [ `use gtk2` ]; then + einfo "you cannot specify both odbc and gtk2" + einfo "Choosing gtk2 over odbc" + einfo "re-run with USE="-gtk2" to enable odbc" + myconf="${myconf} --without-odbc" + else + myconf="${myconf} --without-odbc" + fi use opengl \ && myconf="${myconf} --with-opengl" \ |