httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/modules/aaa config.m4
Date Fri, 17 Aug 2001 00:31:50 GMT
jerenkrantz    01/08/16 17:31:50

  Modified:    .        CHANGES acinclude.m4
               modules/aaa config.m4
  Log:
  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.
  
  Revision  Changes    Path
  1.305     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.304
  retrieving revision 1.305
  diff -u -r1.304 -r1.305
  --- CHANGES	2001/08/16 21:11:30	1.304
  +++ CHANGES	2001/08/17 00:31:49	1.305
  @@ -1,5 +1,9 @@
   Changes with Apache 2.0.25-dev
   
  +  *) 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.  [Justin Erenkrantz]
  +
     *) Fix an assertion failure in mod_ssl when the keepalive timeout is  
        reached.  [Jeff Trawick]
   
  
  
  
  1.91      +10 -1     httpd-2.0/acinclude.m4
  
  Index: acinclude.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/acinclude.m4,v
  retrieving revision 1.90
  retrieving revision 1.91
  diff -u -r1.90 -r1.91
  --- acinclude.m4	2001/07/30 02:55:55	1.90
  +++ acinclude.m4	2001/08/17 00:31:50	1.91
  @@ -217,6 +217,16 @@
         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 @@
         fi
         shared="";;
       esac
  -    ifelse([$6],,:,[$6])
       APACHE_MODPATH_ADD($1, $shared, $3)
     fi
   ])dnl
  
  
  
  1.43      +7 -3      httpd-2.0/modules/aaa/config.m4
  
  Index: config.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/aaa/config.m4,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- config.m4	2001/05/12 03:48:30	1.42
  +++ config.m4	2001/08/17 00:31:50	1.43
  @@ -10,11 +10,15 @@
   APACHE_MODULE(auth_dbm, DBM-based access databases, , , most)
   
   APACHE_MODULE(auth_db, DB-based access databases, , , , [
  -  AC_CHECK_HEADERS(db.h)
  -  AC_CHECK_LIB(db,main)
  +  AC_CHECK_HEADERS(db.h,,enable_auth_db=no)
  +  AC_CHECK_LIB(db,main,,enable_auth_db=no)
   ]) 
   
  -APACHE_MODULE(auth_digest, RFC2617 Digest authentication, , , most)
  +APACHE_MODULE(auth_digest, RFC2617 Digest authentication, , , most, [
  +  AC_TRY_COMPILE([#include <apr.h>], 
  +                 [#if !APR_HAS_RANDOM #error You need APR random support to use auth_digest.
#endif],,
  +                 enable_auth_digest=no)
  +])
   
   APR_ADDTO(LT_LDFLAGS,-export-dynamic)
   
  
  
  

Mime
View raw message