/[gentoo-x86]/eclass/apache-2.eclass
Gentoo

Diff of /eclass/apache-2.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.20 Revision 1.26
1# Copyright 1999-2007 Gentoo Foundation 1# Copyright 1999-2011 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.20 2010/03/05 09:01:07 hollow Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/apache-2.eclass,v 1.26 2011/12/27 17:55:12 fauli Exp $
4 4
5EAPI="2" 5EAPI="2"
6 6
7# @ECLASS: apache-2.eclass 7# @ECLASS: apache-2.eclass
8# @MAINTAINER: 8# @MAINTAINER:
241 if use ssl ; then 241 if use ssl ; then
242 MY_CONF="${MY_CONF} --with-ssl=/usr --enable-ssl=${mod_type}" 242 MY_CONF="${MY_CONF} --with-ssl=/usr --enable-ssl=${mod_type}"
243 MY_MODS="${MY_MODS} ssl" 243 MY_MODS="${MY_MODS} ssl"
244 else 244 else
245 MY_CONF="${MY_CONF} --without-ssl --disable-ssl" 245 MY_CONF="${MY_CONF} --without-ssl --disable-ssl"
246 fi
247
248 if use threads || has ${MY_MPM} ${IUSE_MPMS_THREAD} ; then
249 MY_CONF="${MY_CONF} --enable-cgid=${mod_type}"
250 MY_MODS="${MY_MODS} cgid"
251 else
252 MY_CONF="${MY_CONF} --enable-cgi=${mod_type}"
253 MY_MODS="${MY_MODS} cgi"
254 fi 246 fi
255 247
256 if use suexec ; then 248 if use suexec ; then
257 elog "You can manipulate several configure options of suexec" 249 elog "You can manipulate several configure options of suexec"
258 elog "through the following environment variables:" 250 elog "through the following environment variables:"
432 mv docs/man/{httpd,apache2}.8 424 mv docs/man/{httpd,apache2}.8
433 sed -i -e 's/httpd\.8/apache2.8/g' Makefile.in 425 sed -i -e 's/httpd\.8/apache2.8/g' Makefile.in
434 426
435 # patched-in MPMs need the build environment rebuilt 427 # patched-in MPMs need the build environment rebuilt
436 sed -i -e '/sinclude/d' configure.in 428 sed -i -e '/sinclude/d' configure.in
437 AT_GNUCONF_UPDATE=yes AT_M4DIR=build eautoreconf 429 AT_M4DIR=build eautoreconf
438} 430}
439 431
440# @FUNCTION: apache-2_src_configure 432# @FUNCTION: apache-2_src_configure
441# @DESCRIPTION: 433# @DESCRIPTION:
442# This function adds compiler flags and runs econf and emake based on MY_MPM and 434# This function adds compiler flags and runs econf and emake based on MY_MPM and
494 # generate a sane default APACHE2_OPTS 486 # generate a sane default APACHE2_OPTS
495 APACHE2_OPTS="-D DEFAULT_VHOST -D INFO" 487 APACHE2_OPTS="-D DEFAULT_VHOST -D INFO"
496 use doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL" 488 use doc && APACHE2_OPTS="${APACHE2_OPTS} -D MANUAL"
497 use ssl && APACHE2_OPTS="${APACHE2_OPTS} -D SSL -D SSL_DEFAULT_VHOST" 489 use ssl && APACHE2_OPTS="${APACHE2_OPTS} -D SSL -D SSL_DEFAULT_VHOST"
498 use suexec && APACHE2_OPTS="${APACHE2_OPTS} -D SUEXEC" 490 use suexec && APACHE2_OPTS="${APACHE2_OPTS} -D SUEXEC"
499 if hasq negotiation ${APACHE2_MODULES} && use apache2_modules_negotiation; then 491 if has negotiation ${APACHE2_MODULES} && use apache2_modules_negotiation; then
500 APACHE2_OPTS="${APACHE2_OPTS} -D LANGUAGE" 492 APACHE2_OPTS="${APACHE2_OPTS} -D LANGUAGE"
501 fi 493 fi
502 494
503 sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \ 495 sed -i -e "s:APACHE2_OPTS=\".*\":APACHE2_OPTS=\"${APACHE2_OPTS}\":" \
504 "${GENTOO_PATCHDIR}"/init/apache2.confd || die "sed failed" 496 "${GENTOO_PATCHDIR}"/init/apache2.confd || die "sed failed"
574 566
575 if [[ ! -e "${ROOT}/var/www/localhost" ]] ; then 567 if [[ ! -e "${ROOT}/var/www/localhost" ]] ; then
576 mkdir -p "${ROOT}/var/www/localhost/htdocs" 568 mkdir -p "${ROOT}/var/www/localhost/htdocs"
577 echo "<html><body><h1>It works!</h1></body></html>" > "${ROOT}/var/www/localhost/htdocs/index.html" 569 echo "<html><body><h1>It works!</h1></body></html>" > "${ROOT}/var/www/localhost/htdocs/index.html"
578 fi 570 fi
571
572 echo
573 elog "Attention: cgi and cgid modules are now handled via APACHE2_MODULES flags"
574 elog "in /etc/make.conf. Make sure to enable those in order to compile them."
575 elog "In general, you should use 'cgid' with threaded MPMs and 'cgi' otherwise."
576 echo
577
579} 578}
580 579
581EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_install pkg_postinst 580EXPORT_FUNCTIONS pkg_setup src_prepare src_configure src_install pkg_postinst

Legend:
Removed from v.1.20  
changed lines
  Added in v.1.26

  ViewVC Help
Powered by ViewVC 1.1.20