Add strucutre to autoconf-config system to allow modules to specify

config tests to run if they are enabled.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84231 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4
index a71175b88291a7fae5a5a8849cde94e334d796d5..20b38b522b06783a81f84f1fae8d6c1ce60a9db7 100644 (file)
--- a/modules/aaa/config.m4
+++ b/modules/aaa/config.m4
@@ -6,18 +6,19 @@ AC_DEFUN(STANDARD_MODULE,[
   STANDARD_LIBS="$STANDARD_LIBS libapachemod_$1.la"
 ])
 
-dnl AC_DEFUN(modulename, modulestructname, defaultonoroff)
+dnl AC_DEFUN(modulename, modulestructname, defaultonoroff, configmacros)
 dnl XXX - Need to add help text to --enable-module flags
-dnl XXX - Need to add support for per-module config
+dnl XXX - Need to allow --enable-module to fail if optional config fails
 AC_DEFUN(APACHE_CHECK_STANDARD_MODULE, [
     AC_MSG_CHECKING([whether to enable mod_$1])
     AC_ARG_ENABLE(patsubst([$1], _, -), [  --enable-]patsubst([$1], _, -), [],
         [enable_$1=]ifelse([$3], , no, [$3]))
+    AC_MSG_RESULT([$enable_$1])
     if test "$enable_[$1]" != "no" ; then
+        ifelse([$4], , :, [$4])
         MODLIST="$MODLIST ifelse([$2], , [$1], [$2])"
         STANDARD_MODULE([$1])
     fi
-    AC_MSG_RESULT([$enable_$1])
 ])
 
 APACHE_CHECK_STANDARD_MODULE(mmap_static, , no)
@@ -49,9 +50,10 @@ APACHE_CHECK_STANDARD_MODULE(cern_meta, , no)
 APACHE_CHECK_STANDARD_MODULE(expires, , no)
 APACHE_CHECK_STANDARD_MODULE(headers, , no)
 
-AC_CHECK_HEADERS(sys/times.h)
-AC_CHECK_FUNCS(times)
-APACHE_CHECK_STANDARD_MODULE(usertrack, , no)
+APACHE_CHECK_STANDARD_MODULE(usertrack, , no, [
+  AC_CHECK_HEADERS(sys/times.h)
+  AC_CHECK_FUNCS(times)
+])
 
 APACHE_CHECK_STANDARD_MODULE(unique_id, , no)
 APACHE_CHECK_STANDARD_MODULE(so, , no)