diff options
author | Chris White <chriswhite@gentoo.org> | 2005-01-07 02:38:01 +0000 |
---|---|---|
committer | Chris White <chriswhite@gentoo.org> | 2005-01-07 02:38:01 +0000 |
commit | b02802dec79edb88cff27b379d9d381a4c269039 (patch) | |
tree | 9288db29958346dba435a006a4b21298eb8b8b76 /media-libs | |
parent | doenvd, not doconfd (Manifest recommit) (diff) | |
download | gentoo-2-b02802dec79edb88cff27b379d9d381a4c269039.tar.gz gentoo-2-b02802dec79edb88cff27b379d9d381a4c269039.tar.bz2 gentoo-2-b02802dec79edb88cff27b379d9d381a4c269039.zip |
Trying to refix #76517 by adding in better X11 lib logic. Hopefully this works.
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/libcaca/ChangeLog | 6 | ||||
-rw-r--r-- | media-libs/libcaca/libcaca-0.9-r1.ebuild | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/media-libs/libcaca/ChangeLog b/media-libs/libcaca/ChangeLog index a9db0263b22b..64f6b119005e 100644 --- a/media-libs/libcaca/ChangeLog +++ b/media-libs/libcaca/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libcaca # 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 $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.16 2005/01/07 02:38:01 chriswhite Exp $ + + 07 Jan 2005; Chris White <chriswhite@gentoo.org> libcaca-0.9-r1.ebuild: + Trying to refix #76517 by adding in better X11 lib logic. Hopefully this + works. 04 Jan 2005; Chris White <chriswhite@gentoo.org> libcaca-0.9-r1.ebuild: Fixed Bug #72426 by adding --with logic to configure. diff --git a/media-libs/libcaca/libcaca-0.9-r1.ebuild b/media-libs/libcaca/libcaca-0.9-r1.ebuild index d4a2e9a1c93c..c0c442015133 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-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.6 2005/01/03 21:43:22 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.9-r1.ebuild,v 1.7 2005/01/07 02:38:01 chriswhite Exp $ inherit eutils @@ -38,7 +38,12 @@ src_compile() { local myconf="" if use X ; then - myconf="${myconf} --enable-x11 --with-x --x-libraries=/usr/$(get_libdir)" + if [ -e /usr/lib/libX11.so ] || [ -e /usr/lib/libX11.a ] + then + myconf="${myconf} --enable-x11 --with-x --x-libraries=/usr/$(get_libdir)" + else + myconf="${myconf} --enable-x11 --with-x --x-libraries=/usr/X11R6/$(get_libdir)" + fi else myconf="${myconf} --disable-x11" fi |