Merge r321489 from trunk:

make mod_dbd.h available for all who need it

Submitted by: nd
Reviewed by: jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@328633 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.in b/Makefile.in
index 4e04dd05680b738a14bf647b939c93ca4d22d6d7..1f4181bb66f6e6a705da4bb731d3d8ca7c6f6460 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -176,6 +176,7 @@ INSTALL_HEADERS = \
        $(srcdir)/os/$(OS_DIR)/os.h \
        $(srcdir)/server/mpm/$(MPM_SUBDIR_NAME)/*.h \
        $(srcdir)/modules/aaa/mod_auth.h \
+       $(srcdir)/modules/database/mod_dbd.h \
        $(srcdir)/modules/dav/main/mod_dav.h \
        $(srcdir)/modules/filters/mod_include.h \
        $(srcdir)/modules/generators/mod_cgi.h \

diff --git a/configure.in b/configure.in
index 86ca5bee6783db84e3c0f4d9d91884d3fa036e53..6b7b056d93270b5c9c1694d00a7d770a0494c8ab 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -183,7 +183,7 @@ if test "$abs_builddir" != "$abs_srcdir"; then
   APR_ADDTO(INCLUDES, [-I\$(top_builddir)/include])
 fi
 
-APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_srcdir)/modules/http -I\$(top_srcdir)/modules/filters -I\$(top_srcdir)/modules/proxy -I\$(top_srcdir)/include -I\$(top_srcdir)/modules/generators -I\$(top_srcdir)/modules/mappers])
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/server/mpm/\$(MPM_SUBDIR_NAME) -I\$(top_srcdir)/modules/http -I\$(top_srcdir)/modules/filters -I\$(top_srcdir)/modules/proxy -I\$(top_srcdir)/include -I\$(top_srcdir)/modules/generators -I\$(top_srcdir)/modules/mappers -I\$(top_srcdir)/modules/database])
 
 # apr/apr-util --includes may pick up system paths for dependent
 # libraries, so ensure these are later in INCLUDES than local source