--- acinclude.m4.orig	2003-11-07 12:37:21.000000000 -0800
+++ acinclude.m4	2003-12-17 19:43:03.564874260 -0800
@@ -9,6 +9,9 @@
         AC_ARG_WITH(apache2-apxs,
                 AC_HELP_STRING([--with-apache2-apxs],[path to apache2's apxs]),
                 [APACHE2_APXS=$withval],[APACHE2_APXS="apxs"])
+        AC_ARG_WITH(apache2-httpd,
+                AC_HELP_STRING([--with-apache2-httpd],[path to apache2 httpd binary]),
+                [APACHE2_HTTPD=$withval],[APACHE2_HTTPD=""])
         AC_ARG_WITH(apache2-src,
                 AC_HELP_STRING([--with-apache2-src],[path to httpd-2 source]),
                 [APACHE2_SRC=$withval],[APACHE2_SRC=""])
@@ -22,7 +25,9 @@
                     AC_MSG_ERROR([invalid Apache2 source directory]))
 
                 APACHE2_INCLUDES=-I$APACHE2_SRC/include
+								if test -z "${APACHE2_HTTPD}"; then
                 APACHE2_HTTPD=$APACHE2_SRC/httpd
+								fi
                 AC_ARG_WITH(apr-config,
                     AC_HELP_STRING([  --with-apr-config],[path to apr-config (requires --with-apache2-src)]),
                     [APR_CONFIG=$withval],[APR_CONFIG="$APACHE2_SRC/srclib/apr/apr-config"])
@@ -32,10 +37,13 @@
 
         else
                 APACHE2_INCLUDES=-I`$APACHE2_APXS -q INCLUDEDIR`
+								if test -z "${APACHE2_HTTPD}"; then
                 APACHE2_HTTPD=`$APACHE2_APXS -q SBINDIR`/httpd
+								fi
                 APR_CONFIG=`$APACHE2_APXS -q APR_BINDIR`/apr-config
                 APU_CONFIG=`$APACHE2_APXS -q APU_BINDIR`/apu-config
 
+								echo "checking with $APACHE2_HTTPD"
                 if test -z "`$prereq_check apache2 $APACHE2_HTTPD`"; then
                     AC_MSG_ERROR([Bad apache2 version])
                 fi