diff options
| author | Justin Erenkrantz <jerenkrantz@apache.org> | 2001-08-17 02:31:50 +0200 |
|---|---|---|
| committer | Justin Erenkrantz <jerenkrantz@apache.org> | 2001-08-17 02:31:50 +0200 |
| commit | 024d0191a578338d37e8543cce9c87891c761673 (patch) | |
| tree | 6d2862691b17b5c84e4d6f3072e91e72c145387b /acinclude.m4 | |
| parent | Thought this had already been axed (diff) | |
| download | apache2-024d0191a578338d37e8543cce9c87891c761673.tar.xz apache2-024d0191a578338d37e8543cce9c87891c761673.zip | |
Fix --enable-modules=all breakage with mod_auth_db and mod_auth_digest
by allowing a module to disable itself if its prerequisites are not met.
This introduces the subtle nuance that if you request a module and you
don't meet its prerequisites, it'll refuse to build itself.
mod_ssl exits if its prerequisites are not met.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90261 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index d5c80009fd..21bf5d6cf8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -217,6 +217,16 @@ AC_DEFUN(APACHE_MODULE,[ enable_$1=no fi fi + if test "$enable_$1" != "no"; then + dnl If we plan to enable it, allow the module to run some autoconf magic + dnl that may disable it because of missing dependencies. + ifelse([$6],,:,[AC_MSG_RESULT([checking dependencies]) + $6 + AC_MSG_CHECKING(whether to enable mod_$1) + if test "$enable_$1" = "no"; then + _apmod_extra_msg=" (disabled)" + fi]) + fi AC_MSG_RESULT($enable_$1$_apmod_extra_msg) if test "$enable_$1" != "no"; then case "$enable_$1" in @@ -231,7 +241,6 @@ AC_DEFUN(APACHE_MODULE,[ fi shared="";; esac - ifelse([$6],,:,[$6]) APACHE_MODPATH_ADD($1, $shared, $3) fi ])dnl |