From: Jim Jagielski <jim@apache.org>
Date: Mon, 19 Aug 2013 15:42:37 +0000 (+0000)
Subject: Merge r1503680 from trunk:
X-Git-Tag: 2.4.7~283
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25c750b1ec080c3ac7b2ccf7f5c71ed4ade1805d;p=apache

Merge r1503680 from trunk:

maintainer-mode should auto-enable mod_bucketeer

Reviewed/backported by: jim


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

diff --git a/STATUS b/STATUS
index a68f6344f5..db7323678e 100644
--- a/STATUS
+++ b/STATUS
@@ -92,10 +92,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * configure: '--enable-maintainer-mode' should also auto-enable mod_bucketeer
-    trunk: http://svn.apache.org/viewvc?view=revision&revision=1503680
-    2.4.x patch: trunk patch works
-    +1: jim, druggeri, sf
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
diff --git a/configure.in b/configure.in
index a4a2e1b42f..8120156841 100644
--- a/configure.in
+++ b/configure.in
@@ -608,6 +608,10 @@ AC_ARG_ENABLE(maintainer-mode,APACHE_HELP_STRING(--enable-maintainer-mode,Turn o
       LOAD_ALL_MODULES=yes
       AC_MSG_NOTICE([Maintainer mode setting "LOAD_ALL_MODULES" to $LOAD_ALL_MODULES])
     fi
+    if test "x$enable_bucketeer" = "x"; then
+      enable_bucketeer=yes
+      AC_MSG_NOTICE([Maintainer mode setting "enable_bucketeer" to yes])
+    fi
   fi
 ])dnl