diff options
author | Joe Orton <jorton@apache.org> | 2005-12-16 15:46:54 +0100 |
---|---|---|
committer | Joe Orton <jorton@apache.org> | 2005-12-16 15:46:54 +0100 |
commit | 66bdf7b618dbca9f6dc145dd2f5f60a23eae9dce (patch) | |
tree | 0dc71b9a824aebaa8be331fa09d5604f4cdcc3a9 | |
parent | Bring forward the fix for CVE-2005-3352 already on the branches: (diff) | |
download | apache2-66bdf7b618dbca9f6dc145dd2f5f60a23eae9dce.tar.xz apache2-66bdf7b618dbca9f6dc145dd2f5f60a23eae9dce.zip |
* acinclude.m4 (APACHE_ENABLE_MODULES): Support passing "none" to
--enable-modules to build an httpd with no optional modules enabled.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@357168 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | acinclude.m4 | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 742711fa8d..98a9ff18af 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -288,15 +288,20 @@ AC_DEFUN(APACHE_ENABLE_MODULES,[ module_default=yes AC_ARG_ENABLE(modules, - APACHE_HELP_STRING(--enable-modules=MODULE-LIST,Space-separated list of modules to enable | "all" | "most"),[ - for i in $enableval; do - if test "$i" = "all" -o "$i" = "most"; then - module_selection=$i - else - i=`echo $i | sed 's/-/_/g'` - eval "enable_$i=yes" - fi - done + APACHE_HELP_STRING(--enable-modules=MODULE-LIST,Space-separated list of modules to enable | "all" | "most" | "none"),[ + if test "$enableval" = "none"; then + module_default=no + module_selection=none + else + for i in $enableval; do + if test "$i" = "all" -o "$i" = "most"; then + module_selection=$i + else + i=`echo $i | sed 's/-/_/g'` + eval "enable_$i=yes" + fi + done + fi ]) AC_ARG_ENABLE(mods-shared, |