You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by je...@apache.org on 2001/08/19 18:00:59 UTC
cvs commit: httpd-2.0 acinclude.m4
jerenkrantz 01/08/19 09:00:59
Modified: . acinclude.m4
Log:
Per discussion on new-httpd, change the logic to do the following:
--enable-modules=most will disable a module if it can not be built
--enable-modules=all will error if a module can not be built
--enable-modules=foo will error if the specified module can not be built
(even if --enable-modules=most is set)
Revision Changes Path
1.92 +12 -1 httpd-2.0/acinclude.m4
Index: acinclude.m4
===================================================================
RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- acinclude.m4 2001/08/17 00:31:50 1.91
+++ acinclude.m4 2001/08/19 16:00:59 1.92
@@ -202,6 +202,13 @@
AC_ARG_ENABLE(translit($1,_,-),optname() substr([ ],len(optname()))$2,,enable_$1=ifelse($5,,maybe-all,$5))
undefine([optname])dnl
_apmod_extra_msg=""
+ dnl When --enable-modules=most is set and the module was not explicitly
+ dnl requested, allow a module to disable itself if its pre-reqs fail.
+ if test "$module_selection" = "most" -a "$enable_$1" = "most"; then
+ _apmod_error_fatal="no"
+ else
+ _apmod_error_fatal="yes"
+ fi
if test "$enable_$1" = "most"; then
if test "$module_selection" = "most" -o "$module_selection" = "all"; then
enable_$1=$module_default
@@ -224,7 +231,11 @@
$6
AC_MSG_CHECKING(whether to enable mod_$1)
if test "$enable_$1" = "no"; then
- _apmod_extra_msg=" (disabled)"
+ if test "$_apmod_error_fatal" = "no"; then
+ _apmod_extra_msg=" (disabled)"
+ else
+ AC_MSG_ERROR([mod_$1 has been requested but can not be built due to prerequisite failures])
+ fi
fi])
fi
AC_MSG_RESULT($enable_$1$_apmod_extra_msg)