From fd02f2e6729f039fcbe1c0becebb0a90c848aa03 Mon Sep 17 00:00:00 2001
From: "Graham.Dumpleton" <devnull@localhost>
Date: Fri, 22 May 2009 05:27:25 +0000
Subject: Backport of check for header files when determining Apache version.
 See ticket #147.

---
 configure    | 25 +++++++++++++++++++------
 configure.ac | 25 +++++++++++++++++++------
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/configure b/configure
index a344ec9..7eb59a8 100755
--- a/configure
+++ b/configure
@@ -1296,7 +1296,25 @@ fi
 echo "$as_me:$LINENO: checking Apache version" >&5
 echo $ECHO_N "checking Apache version... $ECHO_C" >&6
 HTTPD="`${APXS} -q SBINDIR`/`${APXS} -q TARGET`"
-HTTPD_VERSION=`$HTTPD -v | awk '/version/ {print $3}' | awk -F/ '{print $2}'`
+HTTPD_INCLUDEDIR="`${APXS} -q INCLUDEDIR`"
+if test -x ${HTTPD}; then
+    HTTPD_VERSION=`${HTTPD} -v | awk '/version/ {print $3}' \
+     | awk -F/ '{print $2}'`
+else
+    if test -f ${HTTPD_INCLUDEDIR}/ap_release.h; then
+        HTTPD_VERSION=`grep '^#define AP_SERVER_MAJORVERSION_NUMBER ' \
+         ${HTTPD_INCLUDEDIR}/ap_release.h | sed -e \
+         's/^#define AP_SERVER_MAJORVERSION_NUMBER \([0-9]\).*/\1.X/'`
+    else
+        if test -f ${HTTPD_INCLUDEDIR}/httpd.h; then
+            HTTPD_VERSION=`grep '^#define APACHE_RELEASE ' \
+             ${HTTPD_INCLUDEDIR}/httpd.h | sed -e \
+             's/^#define APACHE_RELEASE \([0-9]\).*/\1.X/'`
+        else
+            HTTPD_VERSION="2.?"
+        fi
+    fi
+fi
 echo "$as_me:$LINENO: result: $HTTPD_VERSION" >&5
 echo "${ECHO_T}$HTTPD_VERSION" >&6
 
@@ -1452,11 +1470,6 @@ fi
 LDFLAGS="${LDFLAGS} ${LDFLAGS1} ${LDFLAGS2} ${LDFLAGS3}"
 LDLIBS="${LDLIBS} ${LDLIBS1} ${LDLIBS2} ${LDLIBS3}"
 
-#LDFLAGS=`echo ${LDFLAGS} | \
-# sed -e "s/-Wl,\([[^ ]][[^ ]]*\)/\1/g" -e "s/\([[^ ]][[^ ]]*\)/-Wl,\1/g"`
-#LDLIBS=`echo ${LDLIBS} | \
-# sed -e "s/-Wl,\([[^ ]][[^ ]]*\)/\1/g" -e "s/\([[^ ]][[^ ]]*\)/-Wl,\1/g"`
-
 
 
 
diff --git a/configure.ac b/configure.ac
index 9c4ffab..93666de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,25 @@ AC_SUBST(APXS)
 
 AC_MSG_CHECKING(Apache version)
 HTTPD="`${APXS} -q SBINDIR`/`${APXS} -q TARGET`"
-HTTPD_VERSION=`$HTTPD -v | awk '/version/ {print $3}' | awk -F/ '{print $2}'`
+HTTPD_INCLUDEDIR="`${APXS} -q INCLUDEDIR`"
+if test -x ${HTTPD}; then
+    HTTPD_VERSION=`${HTTPD} -v | awk '/version/ {print $3}' \
+     | awk -F/ '{print $2}'`
+else
+    if test -f ${HTTPD_INCLUDEDIR}/ap_release.h; then
+        HTTPD_VERSION=`grep '^#define AP_SERVER_MAJORVERSION_NUMBER ' \
+         ${HTTPD_INCLUDEDIR}/ap_release.h | sed -e \
+         's/^#define AP_SERVER_MAJORVERSION_NUMBER \([0-9]\).*/\1.X/'`
+    else
+        if test -f ${HTTPD_INCLUDEDIR}/httpd.h; then
+            HTTPD_VERSION=`grep '^#define APACHE_RELEASE ' \
+             ${HTTPD_INCLUDEDIR}/httpd.h | sed -e \
+             's/^#define APACHE_RELEASE \([0-9]\).*/\1.X/'`
+        else
+            HTTPD_VERSION="2.?"
+        fi
+    fi
+fi
 AC_MSG_RESULT($HTTPD_VERSION)
 
 AC_ARG_WITH(python, AC_HELP_STRING([--with-python=NAME],
@@ -144,11 +162,6 @@ fi
 LDFLAGS="${LDFLAGS} ${LDFLAGS1} ${LDFLAGS2} ${LDFLAGS3}"
 LDLIBS="${LDLIBS} ${LDLIBS1} ${LDLIBS2} ${LDLIBS3}"
 
-#LDFLAGS=`echo ${LDFLAGS} | \
-# sed -e "s/-Wl,\([[^ ]][[^ ]]*\)/\1/g" -e "s/\([[^ ]][[^ ]]*\)/-Wl,\1/g"`
-#LDLIBS=`echo ${LDLIBS} | \
-# sed -e "s/-Wl,\([[^ ]][[^ ]]*\)/\1/g" -e "s/\([[^ ]][[^ ]]*\)/-Wl,\1/g"`
-
 AC_SUBST(CFLAGS)
 AC_SUBST(LDFLAGS)
 AC_SUBST(LDLIBS)
-- 
cgit v1.2.1