diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2005-06-06 00:18:55 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2005-06-06 00:18:55 +0000 |
| commit | fa917a29db780040fb934a8acad1faca5e433182 (patch) | |
| tree | 9e6ecf375e7f5950d61d19ceb2e9d506cd5143d9 /eclass | |
| parent | Applied patch; bug #95127. (diff) | |
| download | gentoo-2-fa917a29db780040fb934a8acad1faca5e433182.tar.gz gentoo-2-fa917a29db780040fb934a8acad1faca5e433182.tar.bz2 gentoo-2-fa917a29db780040fb934a8acad1faca5e433182.zip | |
Fix PEAR collision bug with mod_php.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/php-sapi.eclass | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/eclass/php-sapi.eclass b/eclass/php-sapi.eclass index 05d6bba3ebc9..91c0877acfdd 100644 --- a/eclass/php-sapi.eclass +++ b/eclass/php-sapi.eclass @@ -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/eclass/php-sapi.eclass,v 1.66 2005/05/31 21:24:57 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php-sapi.eclass,v 1.67 2005/06/06 00:18:55 robbat2 Exp $ # Author: Robin H. Johnson <robbat2@gentoo.org> inherit eutils flag-o-matic multilib libtool @@ -499,10 +499,16 @@ php-sapi_src_compile() { myconf="${myconf} \ --with-config-file-path=${PHPINIDIRECTORY}" - php-sapi_is_providerbuild || myconf="${myconf} --without-pear" - myconf="${myconf} --libdir=/usr/${libdir}/php" - myconf="${myconf} --with-pear=/usr/lib/php" + + # only provide pear is we are a provider build, and if we do, put it in + # /usr/lib/php. + if php-sapi_is_providerbuild; then + myconf="${myconf} --with-pear=/usr/lib/php" + else + myconf="${myconf} --without-pear" + fi + # fix ELF-related problems if has_pic ; then |