From f086d4c0aaaa605139aa18658a62fa919294cdc8 Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Sun, 27 Jan 2013 11:08:12 -0500 Subject: [PATCH] Test for Apache executable in sbin dirs Debian apparently doesn't include /usr/sbin in the default user PATH, so add an APXS2-like lookup with likely locations if we don't find the apache executable in our standard path. Signed-off-by: Dan Scott Signed-off-by: Jason Etheridge Signed-off-by: Ben Shum --- configure.ac | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index d23354d..8896f2b 100644 --- a/configure.ac +++ b/configure.ac @@ -213,9 +213,18 @@ AC_SUBST([APR_HEADERS]) # Collect apache version number. If for nothing else, this # guarantees that httpd is a working apache executable. # -changequote(<<, >>)dnl APACHE=`$APXS2 -q progname` -APACHE_READABLE_VERSION=`$APACHE -v | grep 'Server version' | sed -e 's;.*Apache/\([0-9\.][0-9\.]*\).*;\1;'` +AC_PATH_PROG(APACHE_PATH, [$APACHE], []) +if test -z "$APACHE_PATH" ; then + for i in /usr/bin /usr/sbin /usr/local/apache/bin /usr/local/apache2/bin ; do + if test -x "$i/$APACHE"; then + APACHE_PATH="$i/$APACHE" + break + fi + done +fi +changequote(<<, >>)dnl +APACHE_READABLE_VERSION=`$APACHE_PATH -v | grep 'Server version' | sed -e 's;.*Apache/\([0-9\.][0-9\.]*\).*;\1;'` changequote([, ])dnl APACHE_VERSION=`echo $APACHE_READABLE_VERSION | sed -e 's/\.//g'` if test -z "$APACHE_VERSION" ; then -- 2.43.2