From 0ef5418db75f81f46f4a82f7b20a69b2f4f30d7e Mon Sep 17 00:00:00 2001
From: Rainer Jung <rjung@apache.org>
Date: Sat, 12 Nov 2011 19:13:44 +0000
Subject: [PATCH] Set --enable-load-all-modules implicitely in maintainer mode
unless disabled explicitely.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1201306 13f79535-47bb-0310-9956-ffa450edef68
---
configure.in | 23 ++++++++++++++---------
docs/manual/programs/configure.xml | 3 ++-
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/configure.in b/configure.in
index ec87191cfb..0a55f506ac 100644
--- a/configure.in
+++ b/configure.in
@@ -540,7 +540,16 @@ AC_ARG_ENABLE(exception-hook,APACHE_HELP_STRING(--enable-exception-hook,Enable f
[Allow modules to run hook after a fatal exception])
])dnl
-AC_ARG_ENABLE(maintainer-mode,APACHE_HELP_STRING(--enable-maintainer-mode,Turn on debugging and compile time warnings),
+AC_ARG_ENABLE(load-all-modules,APACHE_HELP_STRING(--enable-load-all-modules,Load all modules),
+[
+ LOAD_ALL_MODULES=$enableval
+ AC_MSG_NOTICE([Setting "LOAD_ALL_MODULES" to $LOAD_ALL_MODULES])
+],
+[
+ LOAD_ALL_MODULES="no"
+])
+
+AC_ARG_ENABLE(maintainer-mode,APACHE_HELP_STRING(--enable-maintainer-mode,Turn on debugging and compile time warnings and load all compiled modules),
[
APR_ADDTO(CPPFLAGS, -DAP_DEBUG)
if test "$GCC" = "yes"; then
@@ -553,6 +562,10 @@ AC_ARG_ENABLE(maintainer-mode,APACHE_HELP_STRING(--enable-maintainer-mode,Turn o
elif test "$AIX_XLC" = "yes"; then
APR_ADDTO(CFLAGS,-qfullpath -qinitauto=FE -qcheck=all -qinfo=pro)
fi
+ if test "x$enable_load_all_modules" = "x"; then
+ LOAD_ALL_MODULES=yes
+ AC_MSG_NOTICE([Maintainer mode setting "LOAD_ALL_MODULES" to $LOAD_ALL_MODULES])
+ fi
])dnl
AC_ARG_ENABLE(debugger-mode,APACHE_HELP_STRING(--enable-debugger-mode,Turn on debugging and compile time warnings and turn off optimization),
@@ -730,14 +743,6 @@ if test $v4mapped = "yes" -a $ac_cv_define_APR_HAVE_IPV6 = "yes"; then
[Allow IPv4 connections on IPv6 listening sockets])
fi
-AC_ARG_ENABLE(load-all-modules,APACHE_HELP_STRING(--enable-load-all-modules,Load all modules),
-[
- LOAD_ALL_MODULES=$enableval
-],
-[
- LOAD_ALL_MODULES="no"
-])
-
### libapreq build integration.
if test -d $abs_srcdir/srclib/libapreq && false; then
get_version="$abs_srcdir/build/get-version.sh"
diff --git a/docs/manual/programs/configure.xml b/docs/manual/programs/configure.xml
index a762516fdf..fe1810c792 100644
--- a/docs/manual/programs/configure.xml
+++ b/docs/manual/programs/configure.xml
@@ -388,7 +388,8 @@
<section id="otheroptfeat"><title>Cumulative and other options</title>
<dl>
<dt><code>--enable-maintainer-mode</code></dt>
- <dd>Turn on debugging and compile time warnings.</dd>
+ <dd>Turn on debugging and compile time warnings
+ and load all compiled modules.</dd>
<dt><code>--enable-mods-shared=<var>MODULE-LIST</var></code></dt>
<dd>
--
2.40.0