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 Sat, 08 Mar 2003 13:54:17 GMT
trawick     2003/03/08 05:54:17

  Modified:    modules/aaa config.m4
               modules/mappers config9.m4
  Log:
  use APR_CHECK_APR_DEFINE() where possible
  
  an anomaly noticed before and after this commit:
  
  "--enable-cgi=shared --disable-so" is not recognized as inconsistent
  
  Revision  Changes    Path
  1.60      +6 -7      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.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- config.m4	15 Jan 2003 22:08:54 -0000	1.59
  +++ config.m4	8 Mar 2003 13:54:16 -0000	1.60
  @@ -36,13 +36,12 @@
   
   APACHE_MODULE(auth_basic, basic authentication, , , yes)
   APACHE_MODULE(auth_digest, RFC2617 Digest authentication, , , most, [
  -  ap_old_cppflags=$CPPFLAGS
  -  CPPFLAGS="$CPPFLAGS $INCLUDES"
  -  AC_TRY_COMPILE([#include <apr.h>], [
  -#if !APR_HAS_RANDOM 
  -#error You need APR random support to use mod_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)
  
  
  
  1.15      +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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- config9.m4	20 Dec 2002 15:11:13 -0000	1.14
  +++ config9.m4	8 Mar 2003 13:54:17 -0000	1.15
  @@ -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