diff options
| author |   Luca Longinotti <chtekk@gentoo.org> | 2007-05-12 04:59:41 +0000 |
|---|---|---|
| committer | Luca Longinotti <chtekk@gentoo.org> | 2007-05-12 04:59:41 +0000 |
| commit | b1233ee3e1e8ee42aed33cfc92cfba61f606ed44 (patch) | |
| tree | f2272b0a08597cdd6c1914c7115256812ca9801e /eclass/php5_1-sapi.eclass | |
| parent | Version bump, per meatoo status. (diff) | |
| download | gentoo-2-b1233ee3e1e8ee42aed33cfc92cfba61f606ed44.tar.gz gentoo-2-b1233ee3e1e8ee42aed33cfc92cfba61f606ed44.tar.bz2 gentoo-2-b1233ee3e1e8ee42aed33cfc92cfba61f606ed44.zip | |
Remove apache SAPI.
Diffstat (limited to 'eclass/php5_1-sapi.eclass')
| -rw-r--r-- | eclass/php5_1-sapi.eclass | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/eclass/php5_1-sapi.eclass b/eclass/php5_1-sapi.eclass index e6c073c3b5db..69ac1a8b281b 100644 --- a/eclass/php5_1-sapi.eclass +++ b/eclass/php5_1-sapi.eclass @@ -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/php5_1-sapi.eclass,v 1.42 2007/05/10 15:02:01 chtekk Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/php5_1-sapi.eclass,v 1.43 2007/05/12 04:59:41 chtekk Exp $ # ======================================================================== # @@ -258,9 +258,6 @@ php5_1-sapi_install_ini() { elif [[ "${PHPSAPI}" == "cgi" ]] ; then phpmycnfcharset="`php_get_mycnf_charset cgi-fcgi`" einfo "MySQL extensions charset for 'cgi' SAPI is: ${phpmycnfcharset}" - elif [[ "${PHPSAPI}" == "apache" ]] ; then - phpmycnfcharset="`php_get_mycnf_charset apache`" - einfo "MySQL extensions charset for 'apache' SAPI is: ${phpmycnfcharset}" elif [[ "${PHPSAPI}" == "apache2" ]] ; then phpmycnfcharset="`php_get_mycnf_charset apache2handler`" einfo "MySQL extensions charset for 'apache2' SAPI is: ${phpmycnfcharset}" @@ -342,7 +339,7 @@ php5_1-sapi_src_unpack() { sed -e 's/'`echo "\!getenv('NO_INTERACTION')"`'/false/g' -i run-tests.php # Stop PHP from activating the Apache config, as we will do that ourselves - for i in configure sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 ; do + for i in configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 ; do sed -i.orig -e 's,-i -a -n php5,-i -n php5,g' ${i} sed -i.orig -e 's,-i -A -n php5,-i -n php5,g' ${i} done |