summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2004-04-01 08:32:06 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2004-04-01 08:32:06 +0000
commit9d2ffd8651d417bbeac847d90210fd91be26de7b (patch)
tree7bc0d105db12d231f03a508c9c615abf9262bca3 /eclass
parentinherit eutils. (diff)
downloadhistorical-9d2ffd8651d417bbeac847d90210fd91be26de7b.tar.gz
historical-9d2ffd8651d417bbeac847d90210fd91be26de7b.tar.bz2
historical-9d2ffd8651d417bbeac847d90210fd91be26de7b.zip
fix bug #44193.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/php-sapi.eclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass
index cf0ae8e3843e..211514b7e365 100644
--- a/eclass/php-sapi.eclass
+++ b/eclass/php-sapi.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.18 2004/04/01 08:19:20 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.19 2004/04/01 08:32:06 robbat2 Exp $
# Author: Robin H. Johnson <robbat2@gentoo.org>
inherit eutils flag-o-matic
@@ -308,11 +308,12 @@ php-sapi_src_compile() {
fi
elif use gd; then
myconf="${myconf} --with-gd"
- myconf="${myconf} `use_enable truetype gd-native-ttf`"
REQUIREPNG=1 REQUIREJPG=1
else
myconf="${myconf} --without-gd"
fi
+ use gd-external || use gd && myconf="${myconf} `use_enable truetype gd-native-ttf`"
+
use png && REQUIREPNG=1
use jpeg && REQUIREJPG=1
use tiff && REQUIRETIFF=1