From fbad17420be3cab265d24d98ab2916bb714c56b2 Mon Sep 17 00:00:00 2001 From: Christoph Date: Sun, 20 Oct 2019 23:26:24 +0200 Subject: [PATCH] mod_php_install.sh: suport php 7.0 at debian 10 --- mod_php_install.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mod_php_install.sh b/mod_php_install.sh index 1099e93..fcf8c46 100755 --- a/mod_php_install.sh +++ b/mod_php_install.sh @@ -886,7 +886,8 @@ if ([[ "$PHP_MAJOR_VERSION" -eq 7 ]] && [[ "$PHP_MINOR_VERSION" -lt 4 ]]) \ _install_freetype=true - if [[ "$PHP_MAJOR_VERSION" -lt 7 ]] ; then + if [[ "$PHP_MAJOR_VERSION" -lt 7 ]] \ + || ([[ "$PHP_MAJOR_VERSION" -eq 7 ]] && [[ "$PHP_MINOR_VERSION" -eq 0 ]]) ; then echo "" echo "" @@ -2105,7 +2106,8 @@ else fi fi -if [[ "$PHP_MAJOR_VERSION" -eq "5" ]] && [[ "$os_dist" = "debian" ]] && [[ $os_version -ge 10 ]]; then +if ([[ "$PHP_MAJOR_VERSION" -eq "5" ]] || ([[ "$PHP_MAJOR_VERSION" -eq "7" ]] && [[ "$PHP_MINOR_VERSION" -eq 0 ]])) \ + && [[ "$os_dist" = "debian" ]] && [[ $os_version -ge 10 ]]; then config_params="$config_params \ --with-icu-dir=/usr/local/icu4c \ --with-libxml-dir=/usr/local/libxml2"