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

703d4fac · Mike Hibler · 543ab4f6 · 703d4fac · 703d4fac
Commit 703d4fac authored May 14, 2018 by Mike Hibler
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 6 deletions

configure configure +10 -3

configure.ac configure.ac +10 -3

No files found.
--- a/configure
+++ b/configure
@@ -5967,9 +5967,16 @@ else
 	APACHE_VERSION="1.3"
 	APACHE_START_COMMAND="/usr/local/etc/rc.d/apache.sh"
    else
-        INSTALL_APACHE_CONFIG="/usr/local/etc/apache22"
-	APACHE_VERSION="22"
-	APACHE_START_COMMAND="/usr/local/etc/rc.d/apache22"
+        foo=`/usr/local/sbin/httpd -V | grep SERVER_CONFIG_FILE | grep 'apache24'`
+	if test "$foo" = ""; then
+	    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

--- a/configure.ac
+++ b/configure.ac
@@ -940,9 +940,16 @@ AC_ARG_WITH(apache-config-dir,
 	APACHE_VERSION="1.3"
 	APACHE_START_COMMAND="/usr/local/etc/rc.d/apache.sh"
    else
-        INSTALL_APACHE_CONFIG="/usr/local/etc/apache22"
-	APACHE_VERSION="22"
-	APACHE_START_COMMAND="/usr/local/etc/rc.d/apache22"
+        foo=`/usr/local/sbin/httpd -V | grep SERVER_CONFIG_FILE | grep 'apache24'`
+	if test "$foo" = ""; then
+	    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
 ])
 AC_SUBST(INSTALL_APACHE_CONFIG)