From: Joe Orton Date: Wed, 26 Oct 2005 11:48:48 +0000 (+0000) Subject: Merge r321489 from trunk: X-Git-Tag: 2.1.9~10 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b427810044bb6352852d1d0a299bc9b00e11340;p=thirdparty%2Fapache%2Fhttpd.git 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 4e04dd05680..1f4181bb66f 100644 --- 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 86ca5bee678..6b7b056d932 100644 --- 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