diff options
| author | Graham.Dumpleton <devnull@localhost> | 2009-05-22 05:25:08 +0000 |
|---|---|---|
| committer | Graham.Dumpleton <devnull@localhost> | 2009-05-22 05:25:08 +0000 |
| commit | 26d30be5f73a52e34b96961c8374f509bb83f31e (patch) | |
| tree | 0376546aed4c4e7417c3a7be5271e602ecc0b62d | |
| parent | e084562e1db364f66ecd83b59277d0b9c9149d7c (diff) | |
| download | mod_wsgi-26d30be5f73a52e34b96961c8374f509bb83f31e.tar.gz | |
If Apache executable not present, fall back to looking for Apache header files
to determine version of Apache being used. Some distributions build boxes
will not necessarily actually have Apache installed. See ticket #147.
| -rwxr-xr-x | configure | 25 | ||||
| -rw-r--r-- | configure.ac | 25 |
2 files changed, 38 insertions, 12 deletions
@@ -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) |