1 diff -Nuard mod_mono-1.0.orig/configure.in mod_mono-1.0/configure.in
2 --- mod_mono-1.0.orig/configure.in 2004-06-29 18:01:53.000000000 +0200
3 +++ mod_mono-1.0/configure.in 2004-07-05 22:41:23.299809912 +0200
6 AC_MSG_RESULT(not specified))
8 +AC_MSG_CHECKING(for --with-apu-config)
9 +AC_ARG_WITH(apu-config,
10 +[ --with-apu-config=PATH Path to apu-config (apache 2.0). You may use
11 + this option when apr-config is not in the same
12 + directory as apxs and the output of
13 + 'apu-config --includes' is different from
14 + 'apxs -q INCLUDEDIR'.
17 + if test -x "$withval"
19 + AC_MSG_RESULT([$withval executable, good])
22 + if test "xno" = "x$withval" ; then
25 + AC_MSG_ERROR([$withval not found or not executable])
29 +AC_MSG_RESULT(not specified))
31 # if no apxs found yet, check /usr/local/apache/sbin
32 # since it's the default Apache location
33 if test -z "$APXS"; then
35 if test -z "$APRCONFIG" ; then
36 APRCONFIG=`dirname ${APXS}`/apr-config
38 + if test -z "$APUCONFIG" ; then
39 + APUCONFIG=`dirname ${APXS}`/apu-config
43 if test -z "$APRCONFIG"; then
48 +if test -z "$APUCONFIG"; then
49 + AC_MSG_CHECKING(for apu-config in /usr/local/apache/sbin)
50 + if test -x /usr/local/apache/sbin/apu-config; then
51 + APUCONFIG=/usr/local/apache/sbin/apu-config
52 + AC_MSG_RESULT([found, we'll use this. Use --with-apu-config to specify another.])
59 if test -z "$APXS"; then
60 AC_MSG_CHECKING(for apxs2 in /usr/local/apache2/bin)
61 if test -x /usr/local/apache/bin/apxs2; then
66 +if test -z "$APUCONFIG"; then
67 + AC_MSG_CHECKING(for apu-config in /usr/local/apache2/bin)
68 + if test -x /usr/local/apache2/bin/apu-config; then
69 + APUCONFIG=/usr/local/apache2/bin/apu-config
70 + AC_MSG_RESULT([found, we'll use this. Use --with-apu-config to specify another.])
77 if test -z "$APXS"; then
78 AC_MSG_CHECKING(for apxs2 in /usr/sbin)
79 if test -x /usr/sbin/apxs2; then
84 +if test -z "$APUCONFIG"; then
85 + AC_MSG_CHECKING(for apu-config in /usr/sbin)
86 + if test -x /usr/sbin/apu-config; then
87 + APUCONFIG=/usr/sbin/apu-config
88 + AC_MSG_RESULT([found, we'll use this. Use --with-apu-config to specify another.])
96 if test -z "$APXS"; then
97 AC_PATH_PROG(APXS, apxs2)
99 AC_PATH_PROG(APRCONFIG, apr-config)
102 +if test -z "$APUCONFIG"; then
103 + AC_PATH_PROG(APUCONFIG, apr-config)
107 AC_MSG_CHECKING(for Apache libexec directory)
108 APXS_LIBEXECDIR=`${APXS} -q LIBEXECDIR`
113 -if test "$APACHE_VER" = "retry" -a -x "$APRCONFIG"; then
114 - CFLAGS="$CFLAGS `$APRCONFIG --includes`"
115 +if test "$APACHE_VER" = "retry" -a -x "$APRCONFIG" -a -x "$APUCONFIG"; then
116 + CFLAGS="$CFLAGS `$APRCONFIG --includes` `$APUCONFIG --includes`"
121 echo " * apxs = $APXS"
122 test "$APACHE_VER" = "2.0" -a -x "$APRCONFIG" && \
123 echo " * apr-config = $APRCONFIG"
124 +echo " * apu-config = $APUCONFIG"
125 echo " * Verbose logging (debug) = $enable_debug"
126 echo " * mono prefix = $MONO_PREFIX"
127 echo " * Default MonoApplicationsConfigDir = $DFLT_MONO_CONFIG_DIR"