|
Lines 9-14
Link Here
|
| 9 |
AC_ARG_WITH(apache2-apxs, |
9 |
AC_ARG_WITH(apache2-apxs, |
| 10 |
AC_HELP_STRING([--with-apache2-apxs],[path to apache2's apxs]), |
10 |
AC_HELP_STRING([--with-apache2-apxs],[path to apache2's apxs]), |
| 11 |
[APACHE2_APXS=$withval],[APACHE2_APXS="apxs"]) |
11 |
[APACHE2_APXS=$withval],[APACHE2_APXS="apxs"]) |
|
|
12 |
AC_ARG_WITH(apache2-httpd, |
| 13 |
AC_HELP_STRING([--with-apache2-httpd],[path to apache2 httpd binary]), |
| 14 |
[APACHE2_HTTPD=$withval],[APACHE2_HTTPD=""]) |
| 12 |
AC_ARG_WITH(apache2-src, |
15 |
AC_ARG_WITH(apache2-src, |
| 13 |
AC_HELP_STRING([--with-apache2-src],[path to httpd-2 source]), |
16 |
AC_HELP_STRING([--with-apache2-src],[path to httpd-2 source]), |
| 14 |
[APACHE2_SRC=$withval],[APACHE2_SRC=""]) |
17 |
[APACHE2_SRC=$withval],[APACHE2_SRC=""]) |
|
Lines 22-28
Link Here
|
| 22 |
AC_MSG_ERROR([invalid Apache2 source directory])) |
25 |
AC_MSG_ERROR([invalid Apache2 source directory])) |
| 23 |
|
26 |
|
| 24 |
APACHE2_INCLUDES=-I$APACHE2_SRC/include |
27 |
APACHE2_INCLUDES=-I$APACHE2_SRC/include |
|
|
28 |
if test -z "${APACHE2_HTTPD}"; then |
| 25 |
APACHE2_HTTPD=$APACHE2_SRC/httpd |
29 |
APACHE2_HTTPD=$APACHE2_SRC/httpd |
|
|
30 |
fi |
| 26 |
AC_ARG_WITH(apr-config, |
31 |
AC_ARG_WITH(apr-config, |
| 27 |
AC_HELP_STRING([ --with-apr-config],[path to apr-config (requires --with-apache2-src)]), |
32 |
AC_HELP_STRING([ --with-apr-config],[path to apr-config (requires --with-apache2-src)]), |
| 28 |
[APR_CONFIG=$withval],[APR_CONFIG="$APACHE2_SRC/srclib/apr/apr-config"]) |
33 |
[APR_CONFIG=$withval],[APR_CONFIG="$APACHE2_SRC/srclib/apr/apr-config"]) |
|
Lines 32-41
Link Here
|
| 32 |
|
37 |
|
| 33 |
else |
38 |
else |
| 34 |
APACHE2_INCLUDES=-I`$APACHE2_APXS -q INCLUDEDIR` |
39 |
APACHE2_INCLUDES=-I`$APACHE2_APXS -q INCLUDEDIR` |
|
|
40 |
if test -z "${APACHE2_HTTPD}"; then |
| 35 |
APACHE2_HTTPD=`$APACHE2_APXS -q SBINDIR`/httpd |
41 |
APACHE2_HTTPD=`$APACHE2_APXS -q SBINDIR`/httpd |
|
|
42 |
fi |
| 36 |
APR_CONFIG=`$APACHE2_APXS -q APR_BINDIR`/apr-config |
43 |
APR_CONFIG=`$APACHE2_APXS -q APR_BINDIR`/apr-config |
| 37 |
APU_CONFIG=`$APACHE2_APXS -q APU_BINDIR`/apu-config |
44 |
APU_CONFIG=`$APACHE2_APXS -q APU_BINDIR`/apu-config |
| 38 |
|
45 |
|
|
|
46 |
echo "checking with $APACHE2_HTTPD" |
| 39 |
if test -z "`$prereq_check apache2 $APACHE2_HTTPD`"; then |
47 |
if test -z "`$prereq_check apache2 $APACHE2_HTTPD`"; then |
| 40 |
AC_MSG_ERROR([Bad apache2 version]) |
48 |
AC_MSG_ERROR([Bad apache2 version]) |
| 41 |
fi |
49 |
fi |
