Backport r104934:

Allow for the use of --with-module=foo:bar where the ./modules/foo
directory is local only. Assumes, of course, that the required
files are in ./modules/foo, but makes it easier to statically
build/log "external" modules.

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

diff --git a/CHANGES b/CHANGES
index 80b1777455e2aa6125f62d5ea7b91b41f8a5336a..a0db7eb28b151829fff284b21c22f6ea09f2fb71 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,10 @@
 Changes with Apache 2.0.53
 
+  *) Allow for the use of --with-module=foo:bar where the ./modules/foo
+     directory is local only. Assumes, of course, that the required
+     files are in ./modules/foo, but makes it easier to statically
+     build/log "external" modules.  [Jim Jagielski]
+
   *) Util_ldap: Implemented the util_ldap_cache_getuserdn() API so that 
      ldap authorization only modules have access to the util_ldap 
      user cache without having to require ldap authentication as well.  

diff --git a/STATUS b/STATUS
index c98b927f11added8c5ca17e7d093e87d91900d15..a3e873e654ba9b5f778b74ba43ad6f23a0dc3347 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -106,18 +106,6 @@ PATCHES TO BACKPORT FROM 2.1
        PR: 31848
        +1: jorton, wrowe, jim
 
-    *) Allow for the use of --with-module=foo:bar where the ./modules/foo
-       directory is a local addition to the ./modules directory.
-       Assumes, of course, that the required files are in ./modules/foo,
-       but makes it easier to statically build "external" modules by
-       simply adding them to ./modules.
-         modules/config5.m4: 1.4
-       +1: jim, jerenkrantz, erikabele
-       +0: wrowe
-           (would rather see --with-module-lib=foo --enable-bar=shared syntax to
-            support multiple libs, module modules.  Might need to pass the
-            --with-module-lib=foo to ./buildconf instead.)
-
     *) several changes to improve logging of connection-oriented errors, including
        ap_log_cerror() API (needs minor bump in addition to changes below)
          http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/core.c?r1=1.289&r2=1.291

diff --git a/modules/config5.m4 b/modules/config5.m4
index 2e08581731f15e3be55984694e6ae29c5b2f89a5..eec9ec4f77e2f80dc605b052963b1c75cc1cd289 100644 (file)
--- a/modules/config5.m4
+++ b/modules/config5.m4
@@ -37,6 +37,8 @@ EOF
       mv $modpath_current/modules.mk.tmp $modpath_current/modules.mk
     fi
     MODLIST="$MODLIST $module"
+    MODULE_DIRS="$MODULE_DIRS $modtype"
+    APACHE_FAST_OUTPUT($modpath_current/Makefile)
   AC_MSG_RESULT(added $withval)
   ],
   [ AC_MSG_RESULT(no extra modules)