diff options
| author |   Michael Tindal <urilith@gentoo.org> | 2005-06-04 17:59:27 +0000 |
|---|---|---|
| committer | Michael Tindal <urilith@gentoo.org> | 2005-06-04 17:59:27 +0000 |
| commit | 61ed9b989128c01a862b17ae8f605f921e95c4a7 (patch) | |
| tree | c9268292135609be578a5ac2a0c2efa31a36e11d /eclass/apache-module.eclass | |
| parent | Restrict block of gtk-engines-thinice. Resolves bug #46357. (diff) | |
| download | gentoo-2-61ed9b989128c01a862b17ae8f605f921e95c4a7.tar.gz gentoo-2-61ed9b989128c01a862b17ae8f605f921e95c4a7.tar.bz2 gentoo-2-61ed9b989128c01a862b17ae8f605f921e95c4a7.zip | |
Fixing a bug with MPMs (again).
Diffstat (limited to 'eclass/apache-module.eclass')
| -rw-r--r-- | eclass/apache-module.eclass | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/eclass/apache-module.eclass b/eclass/apache-module.eclass index 83b1a129472a..50e7c77a68aa 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.7 2005/06/01 22:54:45 urilith Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/apache-module.eclass,v 1.8 2005/06/04 17:59:27 urilith Exp $ ECLASS=apache-module INHERITED="$INHERITED $ECLASS" @@ -235,12 +235,13 @@ apache2_pkg_setup() { if [ -n "${APACHE2_SAFE_MPMS}" ]; then - 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 + INSTALLED_MPM="$(apxs2 -q MPM_NAME)" + + if ! hasq ${INSTALLED_MPM} ${APACHE2_SAFE_MPMS} ; then + INSTALLED_MPM_UNSAFE="yes" + else + INSTALLED_MPM_SAFE="yes" + fi if [ -z "${INSTALLED_MPM_SAFE}" ] ; then eerror "The module you are trying to install (${PN})" |