Commit 703d4fac authored by Mike Hibler's avatar Mike Hibler

Allow for Apache 2.4 (yes, we are going there...)

parent 543ab4f6
...@@ -5967,9 +5967,16 @@ else ...@@ -5967,9 +5967,16 @@ else
APACHE_VERSION="1.3" APACHE_VERSION="1.3"
APACHE_START_COMMAND="/usr/local/etc/rc.d/apache.sh" APACHE_START_COMMAND="/usr/local/etc/rc.d/apache.sh"
else else
INSTALL_APACHE_CONFIG="/usr/local/etc/apache22" foo=`/usr/local/sbin/httpd -V | grep SERVER_CONFIG_FILE | grep 'apache24'`
APACHE_VERSION="22" if test "$foo" = ""; then
APACHE_START_COMMAND="/usr/local/etc/rc.d/apache22" INSTALL_APACHE_CONFIG="/usr/local/etc/apache22"
APACHE_VERSION="22"
APACHE_START_COMMAND="/usr/local/etc/rc.d/apache22"
else
INSTALL_APACHE_CONFIG="/usr/local/etc/apache24"
APACHE_VERSION="24"
APACHE_START_COMMAND="/usr/local/etc/rc.d/apache24"
fi
fi fi
fi fi
......
...@@ -940,9 +940,16 @@ AC_ARG_WITH(apache-config-dir, ...@@ -940,9 +940,16 @@ AC_ARG_WITH(apache-config-dir,
APACHE_VERSION="1.3" APACHE_VERSION="1.3"
APACHE_START_COMMAND="/usr/local/etc/rc.d/apache.sh" APACHE_START_COMMAND="/usr/local/etc/rc.d/apache.sh"
else else
INSTALL_APACHE_CONFIG="/usr/local/etc/apache22" foo=`/usr/local/sbin/httpd -V | grep SERVER_CONFIG_FILE | grep 'apache24'`
APACHE_VERSION="22" if test "$foo" = ""; then
APACHE_START_COMMAND="/usr/local/etc/rc.d/apache22" INSTALL_APACHE_CONFIG="/usr/local/etc/apache22"
APACHE_VERSION="22"
APACHE_START_COMMAND="/usr/local/etc/rc.d/apache22"
else
INSTALL_APACHE_CONFIG="/usr/local/etc/apache24"
APACHE_VERSION="24"
APACHE_START_COMMAND="/usr/local/etc/rc.d/apache24"
fi
fi fi
]) ])
AC_SUBST(INSTALL_APACHE_CONFIG) AC_SUBST(INSTALL_APACHE_CONFIG)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment