diff options
| author |   Michael Tindal <urilith@gentoo.org> | 2005-06-01 21:10:18 +0000 |
|---|---|---|
| committer | Michael Tindal <urilith@gentoo.org> | 2005-06-01 21:10:18 +0000 |
| commit | 783818679bb463610fade050ae5ad07adf322eb1 (patch) | |
| tree | e83c34c16e5183e07e62770c62a51eae953d4314 /eclass | |
| parent | Disabling tests - ickkkkk (diff) | |
| download | gentoo-2-783818679bb463610fade050ae5ad07adf322eb1.tar.gz gentoo-2-783818679bb463610fade050ae5ad07adf322eb1.tar.bz2 gentoo-2-783818679bb463610fade050ae5ad07adf322eb1.zip | |
Fix to detect safe MPMs in light of the new one-mpm structure in 2.0.54-r6.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/apache-module.eclass | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/eclass/apache-module.eclass b/eclass/apache-module.eclass index e00e3bc7941a..81048103422b 100644 --- a/eclass/apache-module.eclass +++ b/eclass/apache-module.eclass @@ -1,7 +1,7 @@ # Copyright 2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later # Author Michael Tindal <urilith@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/eclass/apache-module.eclass,v 1.5 2005/02/26 18:17:42 vericgar Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/apache-module.eclass,v 1.6 2005/06/01 21:10:18 urilith Exp $ ECLASS=apache-module INHERITED="$INHERITED $ECLASS" @@ -235,14 +235,10 @@ apache2_pkg_setup() { if [ -n "${APACHE2_SAFE_MPMS}" ]; then - INSTALLED_MPMS=$(ls ${ROOT}/usr/sbin/apache2.*) - - for mpm in ${INSTALLED_MPMS}; do - # strip everything up to and including 'apache2.' from ${mpm} - mpm=${mpm#*apache2.} - - if hasq ${mpm} ${APACHE2_SAFE_MPMS} ; then - INSTALLED_MPM_SAFE="${INSTALLED_MPM_SAFE} ${mpm}" + for mpm in ${APACHE2_SAFE_MPMS}; do + MPM_USE="mpm-${mpm}" + if built_with_use apache ${MPM_USE}; then + INSTALLED_MPM_SAFE="yes" fi done |