2 files changed, 14 insertions, 4 deletions

diff --git a/m4/apache.m4 b/m4/apache.m4
index a72343c..3d76b72 100644
--- a/m4/apache.m4
+++ b/m4/apache.m4
@@ -129,7 +129,8 @@ AC_ARG_ENABLE(
                 AC_MSG_ERROR([*** your path, or use the --with-apxs configure option])          
         else
                 APACHE_INCDIR=`$APXS_BIN -q INCLUDEDIR`
-                APACHE_CFLAGS=-I$APACHE_INCDIR
+                APACHE_CPPFLAGS=`$APXS_BIN -q CFLAGS`
+                APACHE_CFLAGS="-I$APACHE_INCDIR"
                 APACHE_MODDIR=`$APXS_BIN -q LIBEXECDIR`
 
                 if test "x$enable_apachetest" = "xyes" ; then
@@ -155,6 +156,7 @@ AC_ARG_ENABLE(
                                         AC_DEFINE(WITH_APACHE13,1,[Define to 1 if we are compiling with Apache 1.3.x])
                                         APACHE_VERSION="13"
                                         APXS_EXTENSION=.so
+                                        APACHE_CFLAGS="-g $APACHE_CFLAGS"
                                         APACHE_DEFS="-DWITH_APACHE13"
                                         ifelse([$3], , , $3),
                                         AC_MSG_RESULT(no)
@@ -164,6 +166,7 @@ AC_ARG_ENABLE(
                 fi
                 AC_SUBST(APACHE_DEFS)
                 AC_SUBST(APACHE_CFLAGS)
+                AC_SUBST(APACHE_CPPFLAGS)
                 AC_SUBST(APACHE_INCDIR)
                 AC_SUBST(APACHE_MODDIR)
                 AC_SUBST(APACHE_VERSION)
diff --git a/m4/mod_ssl.m4 b/m4/mod_ssl.m4
index 6a852b9..a8c6103 100644
--- a/m4/mod_ssl.m4
+++ b/m4/mod_ssl.m4
@@ -14,6 +14,11 @@ AC_ARG_WITH(
                 [AC_HELP_STRING([--with-ssl-inc=DIR],[Location of SSL header files])],
                 ssl_incdir="$withval",
         )
+AC_ARG_WITH(
+                db-inc,
+                [AC_HELP_STRING([--with-db-inc=DIR],[Location of DB header files])],
+                db_incdir="$withval",
+        )
 
         if test "x$ssl_val" = "xyes"; then
                 ac_save_CFLAGS=$CFLAGS
@@ -22,9 +27,11 @@ AC_ARG_WITH(
                 if test "x$ssl_incdir" != "x"; then
                         MOD_SSL_CFLAGS="-I$ssl_incdir -I$ssl_incdir/openssl $MOD_SSL_CFLAGS"
                 fi
-                
-                CFLAGS="-I$APACHE_INCDIR  $MOD_SSL_CFLAGS $CFLAGS"
-                CPPFLAGS="-I$APACHE_INCDIR  $MOD_SSL_CFLAGS $CPPFLAGS"
+                if test "x$db_incdir" != "x"; then
+                        MOD_SSL_CFLAGS="-I$db_incdir $MOD_SSL_CFLAGS"
+                fi
+                CFLAGS="$APACHE_CFLAGS $APACHE_CPPFLAGS $MOD_SSL_CFLAGS $CFLAGS"
+                CPPFLAGS="$APACHE_CFLAGS $APACHE_CPPFLAGS $MOD_SSL_CFLAGS $CPPFLAGS"
                 AC_CHECK_HEADERS([mod_ssl.h],
                         mod_ssl_h=yes
                 )