Author: wade
Date: 2007-04-03 21:52:46 -0400 (Tue, 03 Apr 2007)
New Revision: 75371
Modified:
trunk/mod_mono/ChangeLog
trunk/mod_mono/configure.in
Log:
* configure.in: add checking for headers as configured by
apu-config. It's possible to have libapr headers in a different
location than libapr-util headers. (happens on suse 10.1)
Modified: trunk/mod_mono/ChangeLog
===================================================================
--- trunk/mod_mono/ChangeLog 2007-04-03 22:44:47 UTC (rev 75370)
+++ trunk/mod_mono/ChangeLog 2007-04-04 01:52:46 UTC (rev 75371)
@@ -1,3 +1,9 @@
+2007-04-03 Wade Berrier <[EMAIL PROTECTED]>
+
+ * configure.in: add checking for headers as configured by
+ apu-config. It's possible to have libapr headers in a different
+ location than libapr-util headers. (happens on suse 10.1)
+
2007-03-29 Miguel de Icaza <[EMAIL PROTECTED]>
* src/mod_mono.c (do_command.GET_CLIENT_BLOCK): If we get a -1
Modified: trunk/mod_mono/configure.in
===================================================================
--- trunk/mod_mono/configure.in 2007-04-03 22:44:47 UTC (rev 75370)
+++ trunk/mod_mono/configure.in 2007-04-04 01:52:46 UTC (rev 75371)
@@ -169,6 +169,49 @@
AC_PATH_PROG(APRCONFIG, apr-config)
fi
+# apu-config - libapr-util can have different prefixes than libapr, check from
apu-1-config to make sure
+# (suse 10.1 is an example of this)
+
+for mydir in `dirname ${APXS}` \
+ /usr/local/apache2/sbin \
+ /usr/local/apache2/bin \
+ /usr/local/apache/sbin \
+ /usr/local/apache/bin \
+ /usr/sbin \
+ /usr/bin
+do
+ AC_MSG_CHECKING(for apu-1-config in $mydir)
+ A1="$mydir/apu-1-config"
+ if test -x "$A1" ; then
+ APUCONFIG="$A1"
+ AC_MSG_RESULT(found.)
+ break
+ else
+ AC_MSG_RESULT(no)
+ fi
+
+ AC_MSG_CHECKING(for apr-config in $mydir)
+ A2="$mydir/apr-config"
+ if test -x "$A2" ; then
+ APRCONFIG="$A2"
+ AC_MSG_RESULT(found.)
+ break
+ else
+ AC_MSG_RESULT(no)
+ fi
+done
+
+# last resort 1
+if test -z "$APUCONFIG"; then
+ AC_PATH_PROG(APUCONFIG, apu-1-config)
+fi
+
+# last resort 2
+if test -z "$APUCONFIG"; then
+ AC_PATH_PROG(APUCONFIG, apu-config)
+fi
+
+
APXS_LIBEXECDIR=`${APXS} -q LIBEXECDIR`
APXS_SYSCONFDIR=`${APXS} -q SYSCONFDIR`
AP_INCLUDES="-I`${APXS} -q INCLUDEDIR`"
@@ -183,6 +226,10 @@
CFLAGS="$CFLAGS `$APRCONFIG --includes --cflags`"
CPPFLAGS="$CFLAGS $CPPFLAGS `$APRCONFIG --includes --cflags --cppflags`"
fi
+if test -x "$APUCONFIG" ; then
+ CFLAGS="$CFLAGS `$APUCONFIG --includes`"
+ CPPFLAGS="$CFLAGS $CPPFLAGS `$APUCONFIG --includes`"
+fi
AC_MSG_CHECKING([Apache version])
AC_TRY_COMPILE([
#include <ap_release.h>
@@ -354,6 +401,8 @@
echo " * apxs = $APXS"
test ! "$APACHE_VER" = "1.3" -a -x "$APRCONFIG" && \
echo " * apr-config = $APRCONFIG"
+test "$APUCONFIG" && \
+echo " * apu-config = $APUCONFIG"
echo " * Verbose logging (debug) = $enable_debug"
echo " * mono prefix = $MONO_PREFIX"
echo " * Default MonoApplicationsConfigDir = $DFLT_MONO_CONFIG_DIR"
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches