Always make mod_*.h files available where they exist, modpath by modpath

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@808722 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/configure.in b/configure.in
index f7b22f1fabe4f73222a1bcdfb6ab16d8db6a1ba0..c15b51a6b9e78248aea621e2bde09c4b678eeb64 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -216,7 +216,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)/modules/http -I\$(top_srcdir)/modules/aaa -I\$(top_srcdir)/modules/filters -I\$(top_srcdir)/modules/proxy -I\$(top_srcdir)/modules/session -I\$(top_srcdir)/include -I\$(top_srcdir)/modules/core -I\$(top_srcdir)/modules/generators  -I\$(top_srcdir)/modules/mappers -I\$(top_srcdir)/modules/database])
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/os/\$(OS_DIR) -I\$(top_srcdir)/include])
 
 # apr/apr-util --includes may pick up system paths for dependent
 # libraries, so ensure these are later in INCLUDES than local source

diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4
index 91060622ab62f2b8617da6eada3800f36bcaa620..aa097ded3a69dea9f5977b2727ee96d14f6c207f 100644 (file)
--- a/modules/aaa/config.m4
+++ b/modules/aaa/config.m4
@@ -65,4 +65,6 @@ APACHE_MODULE(auth_digest, RFC2617 Digest authentication, , , most, [
   fi
 ])
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH

diff --git a/modules/arch/unix/config5.m4 b/modules/arch/unix/config5.m4
index e4831b49e5045708a11711904a0a2b6bcb4783d4..1815b6198bfcad36650aa540b51fc77e3e3e4966 100644 (file)
--- a/modules/arch/unix/config5.m4
+++ b/modules/arch/unix/config5.m4
@@ -18,5 +18,7 @@ APACHE_MODULE(privileges, Per-virtualhost Unix UserIDs and enhanced security for
   fi
 ])
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH
 

diff --git a/modules/core/config.m4 b/modules/core/config.m4
index 84e71060ec0211da716bf10bc3b6e36798abd89d..fe1aae78c675d16c3d5840313b619de4c90b21b3 100644 (file)
--- a/modules/core/config.m4
+++ b/modules/core/config.m4
@@ -61,4 +61,6 @@ APACHE_MODULE(watchdog, Watchdog module, , , $enable_watchdog, [
     fi
 ])
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH

diff --git a/modules/database/config.m4 b/modules/database/config.m4
index ab2f941587ab79d6ee48b67134f0b55ca1f1561e..809270be20a67e4c02b74e6a8f1efb0cf7aba96d 100644 (file)
--- a/modules/database/config.m4
+++ b/modules/database/config.m4
@@ -3,4 +3,6 @@ APACHE_MODPATH_INIT(database)
 
 APACHE_MODULE(dbd, Apache DBD Framework, , , most)
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH

diff --git a/modules/dav/main/config5.m4 b/modules/dav/main/config5.m4
index fa2eee476285e0aacd8af9692fed4e3691aad8a1..59c077ebbc8f972480cecfd4297597963a636a16 100644 (file)
--- a/modules/dav/main/config5.m4
+++ b/modules/dav/main/config5.m4
@@ -14,9 +14,8 @@ APACHE_MODULE(dav, WebDAV protocol handling, $dav_objects, , $dav_enable)
 
 if test "$dav_enable" != "no" -o "$enable_dav" != "no"; then
   apache_need_expat=yes
-
-  APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
 fi
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
 
 APACHE_MODPATH_FINISH

diff --git a/modules/filters/config.m4 b/modules/filters/config.m4
index 110bedb1a4f9d1c3fcc2345b99b6911f8dac8016..fa296efd4134166b91434135cf96211b3f36fa9e 100644 (file)
--- a/modules/filters/config.m4
+++ b/modules/filters/config.m4
@@ -76,4 +76,6 @@ APACHE_MODULE(deflate, Deflate transfer encoding support, , , most, [
   fi
 ])
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH

diff --git a/modules/generators/config5.m4 b/modules/generators/config5.m4
index 51a9ee77fd318640e3d194a68698aefc894c45e6..117facf31229126e0aa5754e9568799bf09a2913 100644 (file)
--- a/modules/generators/config5.m4
+++ b/modules/generators/config5.m4
@@ -61,4 +61,6 @@ else
     APACHE_MODULE(cgid, CGI scripts, , , no)
 fi
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH

diff --git a/modules/ldap/config.m4 b/modules/ldap/config.m4
index 2f0bbf9e3943563cf66cb83fa76e164d4484dd72..f962dda2d7383598f16345c8728fc53edc2c8759 100644 (file)
--- a/modules/ldap/config.m4
+++ b/modules/ldap/config.m4
@@ -13,4 +13,6 @@ APACHE_MODULE(ldap, LDAP caching and connection pooling services, $ldap_objects,
   AC_SUBST(MOD_LDAP_LDADD)
 ])
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH

diff --git a/modules/loggers/config.m4 b/modules/loggers/config.m4
index 2d1d142b0cecc9f9ce339110a89c9074f9d711f9..23ee15eee25c5f0c117d366da172bd1580567b37 100644 (file)
--- a/modules/loggers/config.m4
+++ b/modules/loggers/config.m4
@@ -14,4 +14,6 @@ fi
 
 APACHE_MODULE(logio, input and output logging, , , most)
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH

diff --git a/modules/lua/config.m4 b/modules/lua/config.m4
index 78f17ea3aa6d0273f144429e428c48e7c9d109c6..6010980938af47b7fccd1ba2432e4999d0393caf 100644 (file)
--- a/modules/lua/config.m4
+++ b/modules/lua/config.m4
@@ -125,4 +125,6 @@ APACHE_MODULE(lua, Apache Lua Framework, $lua_objects, , no, [
   MOD_LUA_LDADD="$LUA_LIBS"
 ])
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH

diff --git a/modules/mappers/config9.m4 b/modules/mappers/config9.m4
index 8766a89082eb6a20152576f7955589b65caa42cb..ad8b75cbfa0e42c049a9c80593f223d0301a854d 100644 (file)
--- a/modules/mappers/config9.m4
+++ b/modules/mappers/config9.m4
@@ -14,4 +14,6 @@ APACHE_MODULE(userdir, mapping of requests to user-specific directories, , , yes
 APACHE_MODULE(alias, mapping of requests to different filesystem parts, , , yes)
 APACHE_MODULE(rewrite, rule based URL manipulation, , , most)
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH

diff --git a/modules/proxy/config.m4 b/modules/proxy/config.m4
index cd3ba0cca1aa268cdac3b08aa91e73f4251cea5a..f382dde8ed9b02b5fa27a2d4cb5bdfa320cfda62 100644 (file)
--- a/modules/proxy/config.m4
+++ b/modules/proxy/config.m4
@@ -92,6 +92,7 @@ APACHE_MODULE(serf, [Reverse proxy module using Serf], , , no, [
     CHECK_SERF
 ])
 
-APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current/../generators])
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH
 

diff --git a/modules/session/config.m4 b/modules/session/config.m4
index 4721831a22e7c3fc4ef6465ac6b9186fda1dd39e..75d6a5f4c5ddd39925401892f777364021f1ebe3 100644 (file)
--- a/modules/session/config.m4
+++ b/modules/session/config.m4
@@ -30,5 +30,7 @@ APACHE_MODULE(session_crypto, session crypto module, , , no, [
 APACHE_MODULE(session_dbd, session dbd module, , , $session_mods_enable)
 dnl APACHE_MODULE(session_ldap, session ldap module, , , $session_mods_enable)
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH
 

diff --git a/modules/test/config.m4 b/modules/test/config.m4
index 9c150f488f47f3a220216051fd8fee63945b5e36..94cc604b87d2231a638263aafef13200cb9e0324 100644 (file)
--- a/modules/test/config.m4
+++ b/modules/test/config.m4
@@ -8,4 +8,6 @@ APACHE_MODULE(optional_fn_export, example optional function exporter, , , no)
 
 APACHE_MODULE(dialup, rate limits static files to dialup modem speeds, , , no)
 
+APR_ADDTO(INCLUDES, [-I\$(top_srcdir)/$modpath_current])
+
 APACHE_MODPATH_FINISH