From: Chris White <chriswhite@gentoo.org>
Date: Mon, 3 Jan 2005 21:43:22 +0000 (+0000)
Subject: Fixed Bug #72426 by adding --with logic to configure.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=17a0e610fc1881471d35cbd3169a46d5dfda7b67;p=gentoo.git

Fixed Bug #72426 by adding --with logic to configure.
---

diff --git a/media-libs/libcaca/ChangeLog b/media-libs/libcaca/ChangeLog
index f12c3c55095f..a9db0263b22b 100644
--- a/media-libs/libcaca/ChangeLog
+++ b/media-libs/libcaca/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libcaca
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.14 2004/12/29 00:48:36 ciaranm Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.15 2005/01/03 21:43:22 chriswhite Exp $
+
+  04 Jan 2005; Chris White <chriswhite@gentoo.org> libcaca-0.9-r1.ebuild:
+  Fixed Bug #72426 by adding --with logic to configure.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/media-libs/libcaca/libcaca-0.9-r1.ebuild b/media-libs/libcaca/libcaca-0.9-r1.ebuild
index fc84be34ce1c..d4a2e9a1c93c 100644
--- a/media-libs/libcaca/libcaca-0.9-r1.ebuild
+++ b/media-libs/libcaca/libcaca-0.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.9-r1.ebuild,v 1.5 2004/11/08 15:17:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.9-r1.ebuild,v 1.6 2005/01/03 21:43:22 chriswhite Exp $
 
 inherit eutils
 
@@ -34,12 +34,21 @@ src_unpack() {
 src_compile() {
 	# temp font fix #44128
 	export VARTEXFONTS="${T}/fonts"
+
+	local myconf=""
+
+	if use X ; then
+		myconf="${myconf} --enable-x11 --with-x --x-libraries=/usr/$(get_libdir)"
+	else
+		myconf="${myconf} --disable-x11"
+	fi
+
 	econf \
 	    $(use_enable doc) \
 	    $(use_enable ncurses) \
 	    $(use_enable slang) \
 	    $(use_enable imlib imlib2) \
-		$(use_enable X x11) \
+		${myconf} \
 	    || die
 	emake || die
 	unset VARTEXFONTS
diff --git a/media-libs/libcaca/libcaca-0.9.ebuild b/media-libs/libcaca/libcaca-0.9.ebuild
index e7ca1907104f..2ca5549b252d 100644
--- a/media-libs/libcaca/libcaca-0.9.ebuild
+++ b/media-libs/libcaca/libcaca-0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.9.ebuild,v 1.14 2004/09/20 01:11:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.9.ebuild,v 1.15 2005/01/03 21:43:22 chriswhite Exp $
 
 DESCRIPTION="A library that creates colored ASCII-art graphics"
 HOMEPAGE="http://sam.zoy.org/projects/libcaca"