From ca12f06a0a2b7fb286aa6054befb271bd2ba9ee4 Mon Sep 17 00:00:00 2001
From: Teddysun <i@teddysun.com>
Date: Mon, 24 Apr 2017 20:41:19 +0900
Subject: [PATCH] update apache 2.4 compile option enable all modules for
 apache 2.4 as much as possible update some dependencies installation sequence

Signed-off-by: Teddysun <i@teddysun.com>
---
 include/apache.sh      | 18 ++++--------------
 include/php-modules.sh |  6 +++---
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/include/apache.sh b/include/apache.sh
index de89445..964c35d 100644
--- a/include/apache.sh
+++ b/include/apache.sh
@@ -39,18 +39,8 @@ apache_preinstall_settings(){
             --with-included-apr \
             --with-ssl=${openssl_location} \
             --with-nghttp2 \
-            --enable-http2 \
-            --enable-so \
-            --enable-dav \
-            --enable-suexec \
-            --enable-deflate=shared \
-            --enable-ssl=shared \
-            --enable-expires=shared \
-            --enable-headers=shared \
-            --enable-rewrite=shared \
-            --enable-static-support \
-            --enable-modules=all \
-            --enable-mods-shared=all"
+            --enable-modules=reallyall \
+            --enable-mods-shared=reallyall"
         fi
     fi
 }
@@ -60,10 +50,10 @@ install_apache(){
 
     if check_sys packageManager apt;then
         apt-get -y remove apache2 apache2-doc apache2-utils apache2.2-common apache2.2-bin apache2-mpm-prefork apache2-doc apache2-mpm-worker
-        apt-get -y install libssl-dev lynx
+        apt-get -y install libssl-dev libxml2-dev lynx
     elif check_sys packageManager yum;then
         yum -y remove httpd*
-        yum -y install zlib-devel openssl openssl-devel lynx
+        yum -y install zlib-devel openssl openssl-devel libxml2-devel lynx
     fi
 
 if [ "$apache" == "${apache2_2_filename}" ];then
diff --git a/include/php-modules.sh b/include/php-modules.sh
index 5391b8e..5faa9bb 100644
--- a/include/php-modules.sh
+++ b/include/php-modules.sh
@@ -88,8 +88,8 @@ install_php_depends(){
         apt_depends=(
             m4 autoconf bison libbz2-dev libgmp-dev libicu-dev libsasl2-dev libsasl2-modules-ldap
             libldap-2.4-2 libldap2-dev libldb-dev libpam0g-dev libcurl4-gnutls-dev snmp libsnmp-dev
-            autoconf2.13 libxml2-dev openssl pkg-config libxslt1-dev zlib1g-dev libpcre3-dev libtool
-            libjpeg-dev libpng12-dev libfreetype6-dev libmhash-dev libmcrypt-dev libssl-dev patch
+            autoconf2.13 openssl pkg-config libxslt1-dev zlib1g-dev libpcre3-dev libtool
+            libjpeg-dev libpng12-dev libfreetype6-dev libmhash-dev libmcrypt-dev patch
         )
         for depend in ${apt_depends[@]}
         do
@@ -123,7 +123,7 @@ install_php_depends(){
 
         yum_depends=(
             m4 autoconf bison bzip2-devel pam-devel gmp-devel libicu-devel openldap openldap-devel patch
-            libxml2-devel openssl openssl-devel zlib-devel curl-devel pcre-devel libtool-libs libtool-ltdl-devel
+            curl-devel pcre-devel libtool-libs libtool-ltdl-devel
             libjpeg-devel libpng-devel freetype-devel libxslt libxslt-devel
             net-snmp net-snmp-devel net-snmp-utils net-snmp-perl
         )