diff options
| author |   Luca Longinotti <chtekk@gentoo.org> | 2006-04-20 12:15:35 +0000 |
|---|---|---|
| committer | Luca Longinotti <chtekk@gentoo.org> | 2006-04-20 12:15:35 +0000 |
| commit | e95c8f22b5972944452c3766309c75513d97adbe (patch) | |
| tree | 2056c8d208deff3061982a14410f6ca99d406c70 /eclass/php4_4-sapi.eclass | |
| parent | Moved setup code to pkg_setup, hopefully fixing bug #130553. (diff) | |
| download | historical-e95c8f22b5972944452c3766309c75513d97adbe.tar.gz historical-e95c8f22b5972944452c3766309c75513d97adbe.tar.bz2 historical-e95c8f22b5972944452c3766309c75513d97adbe.zip | |
Don't die on USE=-*, eclass part.
Diffstat (limited to 'eclass/php4_4-sapi.eclass')
| -rw-r--r-- | eclass/php4_4-sapi.eclass | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/eclass/php4_4-sapi.eclass b/eclass/php4_4-sapi.eclass index d64dc0e4198a..8bf2dd9b98b9 100644 --- a/eclass/php4_4-sapi.eclass +++ b/eclass/php4_4-sapi.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.17 2006/04/18 22:29:31 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php4_4-sapi.eclass,v 1.18 2006/04/20 12:15:35 chtekk Exp $ # # ######################################################################## # @@ -145,8 +145,6 @@ EXPORT_FUNCTIONS pkg_setup src_compile src_install src_unpack pkg_postinst # ======================================================================== php4_4-sapi_check_use_flags() { - PHPCONFUTILS_AUTO_USE="" - # Multiple USE dependencies phpconfutils_use_depend_any "truetype" "gd" "gd" "gd-external" phpconfutils_use_depend_any "cjk" "gd" "gd" "gd-external" @@ -603,7 +601,7 @@ php4_4-sapi_pkg_postinst() { fi # Create the symlinks for php-cli - if useq cli ; then + if useq cli || phpconfutils_usecheck cli ; then "${ROOT}/usr/sbin/php-select" -t php php4 > /dev/null 2>&1 exitStatus=$? if [[ ${exitStatus} == 5 ]] ; then |