httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: httpd-2.0/modules/mappers config9.m4
Date Tue, 11 Mar 2003 15:25:34 GMT
trawick     2003/03/11 07:25:34

  Modified:    modules/aaa Tag: APACHE_2_0_BRANCH config.m4
               modules/mappers Tag: APACHE_2_0_BRANCH config9.m4
  Log:
  commit some missing bits from wrowe's merge of the out-of-tree-APR
  feature
  
  (modules/aaa/config.m4 was absolutely required; it probably
  would have worked without this modules/mappers/config9.m4 change)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.57.2.3  +6 -8      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.57.2.2
  retrieving revision 1.57.2.3
  diff -u -r1.57.2.2 -r1.57.2.3
  --- config.m4	30 Nov 2002 17:20:28 -0000	1.57.2.2
  +++ config.m4	11 Mar 2003 15:25:34 -0000	1.57.2.3
  @@ -10,14 +10,12 @@
   APACHE_MODULE(auth_dbm, DBM-based access databases, , , most)
   
   APACHE_MODULE(auth_digest, RFC2617 Digest authentication, , , most, [
  -  ap_old_cppflags=$CPPFLAGS
  -  CPPFLAGS="$CPPFLAGS -I$APR_SOURCE_DIR/include -I$abs_builddir/srclib/apr/include"
  -  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)
  -  CPPFLAGS=$ap_old_cppflags
  +  APR_CHECK_APR_DEFINE(APR_HAS_RANDOM)
  +  if test $ac_cv_define_APR_HAS_RANDOM = "no"; then
  +    echo "You need APR random support to use mod_auth_digest."
  +    echo "Look at APR configure options --with-egd and --with-devrandom."
  +    enable_auth_digest="no"
  +  fi
   ])
   
   APR_ADDTO(LT_LDFLAGS,-export-dynamic)
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.12.2.2  +9 -16     httpd-2.0/modules/mappers/config9.m4
  
  Index: config9.m4
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/config9.m4,v
  retrieving revision 1.12.2.1
  retrieving revision 1.12.2.2
  diff -u -r1.12.2.1 -r1.12.2.2
  --- config9.m4	29 Nov 2002 11:05:58 -0000	1.12.2.1
  +++ config9.m4	11 Mar 2003 15:25:34 -0000	1.12.2.2
  @@ -22,23 +22,16 @@
       AC_MSG_ERROR([mod_so can not be built as a shared DSO])
   fi
   
  -ap_old_cppflags=$CPPFLAGS
  -CPPFLAGS="$CPPFLAGS $INCLUDES"
  -AC_TRY_COMPILE([#include <apr.h>], [
  -#if !APR_HAS_DSO
  -#error You need APR DSO support to use mod_so. 
  -#endif
  -], ap_enable_so="static", [
  -if test "$enable_so" = "static"; then
  -    AC_MSG_ERROR([mod_so has been requested but cannot be built on your system])
  -else if test "$sharedobjs" = "yes"; then
  -    AC_MSG_ERROR([shared objects have been requested but cannot be built since mod_so cannot
be built])
  -else
  -    ap_enable_so="no"
  +APR_CHECK_APR_DEFINE(APR_HAS_DSO)
  +if test $ac_cv_define_APR_HAS_DSO = "no"; then
  +    if test "$enable_so" = "static"; then
  +        AC_MSG_ERROR([mod_so has been requested but cannot be built on your system])
  +    elif test "$sharedobjs" = "yes"; then
  +        AC_MSG_ERROR([shared objects have been requested but cannot be built since mod_so
cannot be built])
  +    else
  +        ap_enable_so="no"
  +    fi
   fi
  -fi
  -])
  -CPPFLAGS=$ap_old_cppflags
   
   APACHE_MODULE(so, DSO capability, , , $ap_enable_so)
   
  
  
  

Mime
View raw message