From: Jim Jagielski <jim@apache.org>
Date: Fri, 18 Dec 2009 14:12:02 +0000 (+0000)
Subject: Merge r880794 from trunk:
X-Git-Tag: 2.2.15~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6479b14cffd959ec79a656e96a8cd12fac6e809c;p=thirdparty%2Fapache%2Fhttpd.git

Merge r880794 from trunk:

Build: fix --with-module to work as documented
PR 43881
Submitted: Gez Saunders
Reviewed: Nick Kew


Submitted by: niq
Reviewed/backported by: jim


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

diff --git a/CHANGES b/CHANGES
index 5d5d88c0324..79f44ad2028 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,9 @@ Changes with Apache 2.2.15
      control is still vulnerable, unless using OpenSSL >= 0.9.8l.  
      [Joe Orton, Ruediger Pluem]
 
+   *) Build: fix --with-module to work as documented
+      PR 43881 [Gez Saunders <???>]
+
    *) mod_mime: Make RemoveType override the info from TypesConfig.
       PR 38330. [Stefan Fritsch]
 
diff --git a/STATUS b/STATUS
index a807febe851..dd4a80114f6 100644
--- a/STATUS
+++ b/STATUS
@@ -87,11 +87,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * build: fix --with-module option to work as documented
-    PR 43881
-    Patch: http://svn.apache.org/viewvc?rev=880794&view=rev
-    +1: niq, pgollucci, rjung, jim
-
   * mod_disk_cache, mod_mem_cache: don't cache incomplete responses,
     per RFC 2616, 13.8.
     PR 15866
diff --git a/modules/config5.m4 b/modules/config5.m4
index b8a5868bfef..7dd021ee29a 100644
--- a/modules/config5.m4
+++ b/modules/config5.m4
@@ -18,7 +18,7 @@ AC_ARG_WITH(module,
         fi
         cp $pkg $modpath_current/$modfilec
       fi
-      module=`echo $pkg | sed -e 's;\(.*/\)*mod_\(.*\).c;\2;'`
+      module=`echo $pkg | sed -e 's;\(.*/\).*mod_\(.*\).c;\2;'`
       objects="mod_$module.lo"
       # The filename of a convenience library must have a "lib" prefix:
       libname="libmod_$module.la"