diff options
| author | Vlad Glagolev | 2011-08-11 04:19:02 +0400 |
|---|---|---|
| committer | Vlad Glagolev | 2011-08-11 04:19:02 +0400 |
| commit | bceec202fc1f32778f61d2b08846596372f43724 (patch) | |
| tree | 43277dc9f77acf6e8022e1050e0e648c9b0cd5cf /php-pear | |
| parent | 689d88cca8e8f073a9158798b04b745e5cf3cda5 (diff) | |
php: corrected apache configure flags and int gd deps
Diffstat (limited to 'php-pear')
| -rwxr-xr-x | php-pear/php/CONFIGURE | 8 | ||||
| -rwxr-xr-x | php-pear/php/DEPENDS | 17 | ||||
| -rw-r--r-- | php-pear/php/HISTORY | 4 |
3 files changed, 22 insertions, 7 deletions
diff --git a/php-pear/php/CONFIGURE b/php-pear/php/CONFIGURE index 847589f4c9..cf387bd5a3 100755 --- a/php-pear/php/CONFIGURE +++ b/php-pear/php/CONFIGURE @@ -29,10 +29,10 @@ config_query_option PHP5_OPTS "Enable pcntl support (Only affects CLI/CGI)" n \ message "${MESSAGE_COLOR}Apache-based and *CGI SAPIs are mutually exclusive (though both FastCGI and CGI can be enabled at the same time)${DEFAULT_COLOR}" && config_query_list PHP5_SAPI "What SAPI do you want to use?" \ - apache cgi && + apache cgi none && if [[ $PHP5_SAPI == cgi ]]; then - PHP5_OPTS="${PHP5_OPTS} --enable-cgi" && + PHP5_OPTS="--enable-cgi --without-apxs --without-apxs2 ${PHP5_OPTS}" && if [[ $PHP5_BRANCH == legacy ]]; then config_query_option PHP5_OPTS "Enable FastCGI SAPI?" n \ @@ -40,9 +40,9 @@ if [[ $PHP5_SAPI == cgi ]]; then else message "${MESSAGE_COLOR}The FastCGI SAPI is now always enabled since PHP 5.3.0${DEFAULT_COLOR}" fi -else +elif [[ $PHP5_SAPI == apache ]]; then config_query_list PHP5_APACHE "Which Apache module to build?" \ - none handler filter + handler filter fi && if [[ "${PHP5_PEAR}" == "y" ]] || list_find "$PHP5_OPTS" "--enable-cgi" || list_find "$PHP5_OPTS" "--enable-fastcgi" ; then diff --git a/php-pear/php/DEPENDS b/php-pear/php/DEPENDS index 96fdf3a067..60c992887e 100755 --- a/php-pear/php/DEPENDS +++ b/php-pear/php/DEPENDS @@ -51,8 +51,14 @@ optional_depends pth \ if [[ $PHP5_SAPI == apache ]]; then case "${PHP5_APACHE}" in handler) depends APACHE;; - filter) depends APACHE2;; - esac + filter) depends APACHE2 '--with-apxs2 --without-apxs';; + esac && + + if [[ "$(get_spell_provider $SPELL APACHE)" == 'apache1' ]]; then + PHP5_OPTS="--with-apxs --without-apxs2 $PHP5_OPTS" + else + PHP5_OPTS="--with-apxs2 --without-apxs $PHP5_OPTS" + fi fi && if [[ "$PHP5_PCRE" == "none" ]]; then @@ -220,6 +226,10 @@ if [[ "${PHP5_GD}" != "none" ]]; then "--without-xpm" \ "for XPM image support" && + if [[ "${PHP5_GD}" == "internal" ]]; then + depends JPEG "--with-jpeg-dir=${INSTALL_ROOT}/usr" && + depends libpng "--with-png-dir=${INSTALL_ROOT}/usr" + else optional_depends JPEG \ "--with-jpeg-dir=${INSTALL_ROOT}/usr" \ "--without-jpeg-dir" \ @@ -228,7 +238,8 @@ if [[ "${PHP5_GD}" != "none" ]]; then optional_depends libpng \ "--with-png-dir=${INSTALL_ROOT}/usr" \ "--without-png-dir" \ - "for PNG support (for GD)" && + "for PNG support (for GD)" + fi && optional_depends t1lib \ "--with-t1lib=${INSTALL_ROOT}/usr" \ diff --git a/php-pear/php/HISTORY b/php-pear/php/HISTORY index fd5f13fb48..0201766bdc 100644 --- a/php-pear/php/HISTORY +++ b/php-pear/php/HISTORY @@ -1,3 +1,7 @@ +2011-08-11 Vlad Glagolev <stealth@sourcemage.org> + * DEPENDS, CONFIGURE: corrected apache flags; moved 'none' SAPI selector + to a proper place; fixed dependencies for internal gd + 2011-03-18 George Sherwood <gsherwood@sourcemage.org> * DETAILS: Updated stable to version 5.3.6 |