92e47b6c21
- fix build with subversion 1.8.x PR: 193536 Submitted by: ohauer Approved by: Vick Khera (maintainer) Obtained from: https://bitbucket.org/atlassian/cwdapache/pull-request/18/added-apache-24-compatibility-and-fixed/diff [2] MFH: 2014Q3 [1] fix shaped and tested by Vick Khera [2] based on
64 lines
3.2 KiB
Text
64 lines
3.2 KiB
Text
--- configure.ac.orig 2013-07-26 05:20:50 UTC
|
|
+++ configure.ac
|
|
@@ -1,5 +1,6 @@
|
|
AC_INIT([mod_authnz_crowd], m4_esyscmd([./version-gen]), [support@atlassian.com])
|
|
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
|
|
+AM_INIT_AUTOMAKE([-Wall foreign])
|
|
+AM_PROG_AR
|
|
AC_PROG_CC
|
|
AC_PROG_LIBTOOL
|
|
AC_CONFIG_HEADERS([config.h])
|
|
@@ -16,7 +17,7 @@
|
|
|
|
AC_CHECK_LIB([xml2], [xmlFree], [CFLAGS+=" `xml2-config --cflags`" LIBS+=" `xml2-config --libs`"], [AC_MSG_ERROR([libxml2 was not found])])
|
|
|
|
-AC_CHECK_FILE([/usr/local/apache2/include/httpd.h], [APACHE_INCLUDE_DIR="/usr/local/apache2/include"], [
|
|
+AC_CHECK_FILE([/usr/local/%%APACHEINCLUDEDIR%%/httpd.h], [APACHE_INCLUDE_DIR="/usr/local/%%APACHEINCLUDEDIR%%"], [
|
|
AC_CHECK_FILE([/usr/include/httpd/httpd.h], [APACHE_INCLUDE_DIR="/usr/include/httpd"], [
|
|
AC_CHECK_FILE([/usr/include/apache2/httpd.h], [APACHE_INCLUDE_DIR="/usr/include/apache2"], [
|
|
AC_MSG_ERROR([Could not locate Apache include directory])
|
|
@@ -25,7 +26,7 @@
|
|
])
|
|
AC_SUBST([APACHE_INCLUDE_DIR])
|
|
|
|
-AC_PATH_PROG([HTTPD], [httpd], , [/usr/local/apache2/bin:/usr/sbin])
|
|
+AC_PATH_PROG([HTTPD], [httpd], , [/usr/local/bin:/usr/local/sbin])
|
|
APACHE_BIN_DIR=`AS_DIRNAME($HTTPD)`
|
|
AC_SUBST([APACHE_BIN_DIR])
|
|
|
|
@@ -36,7 +37,7 @@
|
|
])
|
|
AC_SUBST([SVN_DIR])
|
|
|
|
-AC_CHECK_FILE([/usr/libexec/apache2/mod_dav.so], [APACHE_MODULES_DIR="/usr/libexec/apache2"], [
|
|
+AC_CHECK_FILE([/usr/local/%%APACHEMODDIR%%/mod_dav.so], [APACHE_MODULES_DIR="/usr/local/%%APACHEMODDIR%%"], [
|
|
AC_CHECK_FILE([/usr/lib64/httpd/modules/mod_dav.so], [APACHE_MODULES_DIR="/usr/lib64/httpd/modules"], [
|
|
AC_CHECK_FILE([/usr/lib/httpd/modules/mod_dav.so], [APACHE_MODULES_DIR="/usr/lib/httpd/modules"], [
|
|
AC_CHECK_FILE([/usr/lib/apache2/modules/mod_dav.so], [APACHE_MODULES_DIR="/usr/lib/apache2/modules"], [
|
|
@@ -47,7 +48,7 @@
|
|
])
|
|
AC_SUBST([APACHE_MODULES_DIR])
|
|
|
|
-AC_CHECK_FILE([/usr/local/apache2/conf/httpd.conf], [HTTPD_CONF="/usr/local/apache2/conf/httpd.conf"], [
|
|
+AC_CHECK_FILE([/usr/local/%%APACHEETCDIR%%/httpd.conf], [HTTPD_CONF="/usr/local/%%APACHEETCDIR%%/httpd.conf"], [
|
|
AC_CHECK_FILE([/etc/httpd/conf/httpd.conf], [HTTPD_CONF="/etc/httpd/conf/httpd.conf"], [
|
|
AC_CHECK_FILE([/etc/apache2/httpd.conf], [HTTPD_CONF="/etc/apache2/httpd.conf"], [
|
|
AC_CHECK_FILE([/etc/apache2/apache2.conf], [HTTPD_CONF="/etc/apache2/apache2.conf"], [
|
|
@@ -58,7 +59,7 @@
|
|
])
|
|
AC_SUBST([HTTPD_CONF])
|
|
|
|
-AC_CHECK_FILE([/usr/local/apache2/bin/apxs], [APXS="/usr/local/apache2/bin/apxs"], [
|
|
+AC_CHECK_FILE([/usr/local/sbin/apxs], [APXS="/usr/local/sbin/apxs"], [
|
|
AC_CHECK_FILE([/usr/sbin/apxs], [APXS="/usr/sbin/apxs"], [
|
|
AC_CHECK_FILE([/usr/bin/apxs2], [APXS="/usr/bin/apxs2"], [
|
|
AC_MSG_ERROR([Could not locate Apache apxs binary])
|
|
@@ -67,7 +68,7 @@
|
|
])
|
|
AC_SUBST([APXS])
|
|
|
|
-AC_CHECK_FILE([/usr/local/apache2/bin/apachectl], [APACHECTL="/usr/local/apache2/bin/apachectl"], [
|
|
+AC_CHECK_FILE([/usr/local/sbin/apachectl], [APACHECTL="/usr/local/sbin/apachectl"], [
|
|
AC_CHECK_FILE([/usr/sbin/apache2ctl], [APACHECTL="/usr/sbin/apache2ctl"], [
|
|
AC_CHECK_FILE([/usr/sbin/apachectl], [APACHECTL="/usr/sbin/apachectl"], [
|
|
AC_MSG_ERROR([Could not locate Apache apachectl binary])
|