make mod_cgi and mod_cgid modular and handled via USE flags
authorFabio Erculiani <lxnay@gentoo.org>
Sun, 11 Jul 2010 08:22:40 +0000 (08:22 +0000)
committerFabio Erculiani <lxnay@gentoo.org>
Sun, 11 Jul 2010 08:22:40 +0000 (08:22 +0000)
eclass/apache-2.eclass

index 3e383c1a1f464efd5cae5e423d6af9fbe3dd23d4..0f533ef4d95d2082bc3c87eb6284c166b1fc1164 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.20 2010/03/05 09:01:07 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.21 2010/07/11 08:22:40 lxnay Exp $
 
 EAPI="2"
 
@@ -245,14 +245,6 @@ setup_modules() {
                MY_CONF="${MY_CONF} --without-ssl --disable-ssl"
        fi
 
-       if use threads || has ${MY_MPM} ${IUSE_MPMS_THREAD} ; then
-               MY_CONF="${MY_CONF} --enable-cgid=${mod_type}"
-               MY_MODS="${MY_MODS} cgid"
-       else
-               MY_CONF="${MY_CONF} --enable-cgi=${mod_type}"
-               MY_MODS="${MY_MODS} cgi"
-       fi
-
        if use suexec ; then
                elog "You can manipulate several configure options of suexec"
                elog "through the following environment variables:"
@@ -576,6 +568,14 @@ apache-2_pkg_postinst() {
                mkdir -p "${ROOT}/var/www/localhost/htdocs"
                echo "<html><body><h1>It works!</h1></body></html>" > "${ROOT}/var/www/localhost/htdocs/index.html"
        fi
+
+       echo
+       elog "Attention: cgi and cgid modules are now handled via APACHE2_MODULES flags"
+       elog "make sure to enable those in order to compile them. In general, you should"
+       elog "use 'cgi' with non-multithreaded MPMs (such as prefork) and 'cgid' with"
+       elog "multithreaded ones (such as worker)"
+       echo
+
 }
 
 EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_install pkg_postinst