--- configure.in	2005-02-15 21:49:00.000000000 +0100
+++ configure.in.oden	2006-04-15 20:19:42.000000000 +0200
@@ -85,11 +85,11 @@
 AC_SUBST(APXS_BINDIR)
 
 dnl Get Apache directories
-APACHE_INCDIR=-I`$APXS_BINDIR -q INCLUDEDIR`
+APACHE_INCDIR="-I`$APXS_BINDIR -q INCLUDEDIR` `apr-1-config --includes` `apu-1-config --includes`"
 AC_SUBST(APACHE_INCDIR)
 APACHE_LIBEXECDIR=`$APXS_BINDIR -q LIBEXECDIR`
 AC_SUBST(APACHE_LIBEXECDIR)
-APACHE_CFLAGS=`$APXS_BINDIR -q CFLAGS`
+APACHE_CFLAGS="`$APXS_BINDIR -q CFLAGS` `apr-1-config --cppflags`"
 AC_SUBST(APACHE_CFLAGS)
 APACHE_LDFLAGS=`$APXS_BINDIR -q LDFLAGS_SHLIB`
 AC_SUBST(APACHE_LDFLAGS)