apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwool...@apache.org
Subject cvs commit: apr CHANGES configure.in
Date Tue, 28 May 2002 23:15:10 GMT
jwoolley    02/05/28 16:15:10

  Modified:    .        CHANGES configure.in
  Log:
  Added --with-devrandom=[DEV] configure flag which allows a particular
  "/dev/random"-compatible device to be specified, overriding the
  default search path (/dev/random then /dev/arandom then /dev/urandom).
  Also, if --with-egd=<path> is specified, it now implies
  --without-devrandom.
  
  Revision  Changes    Path
  1.291     +6 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.290
  retrieving revision 1.291
  diff -u -d -u -r1.290 -r1.291
  --- CHANGES	22 May 2002 11:15:29 -0000	1.290
  +++ CHANGES	28 May 2002 23:15:10 -0000	1.291
  @@ -1,5 +1,11 @@
   Changes with APR b1
   
  +  *) Added --with-devrandom=[DEV] configure flag which allows a particular
  +     "/dev/random"-compatible device to be specified, overriding the
  +     default search path (/dev/random then /dev/arandom then /dev/urandom).
  +     Also, if --with-egd=<path> is specified, it now implies
  +     --without-devrandom.  [Cliff Woolley]
  +
     *) Darwin/Mac OS X: Don't leave zombie processes when the app calls
        apr_signal(SIGCHLD, SIG_IGN).  This fixes a problem with Apache's
        mod_cgid.  PR 9168.  [Jeff Trawick]
  
  
  
  1.450     +42 -19    apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.449
  retrieving revision 1.450
  diff -u -d -u -r1.449 -r1.450
  --- configure.in	14 May 2002 07:38:16 -0000	1.449
  +++ configure.in	28 May 2002 23:15:10 -0000	1.450
  @@ -1525,17 +1525,50 @@
   fi
   
   dnl #----------------------------- Checking for /dev/random 
  -AC_MSG_CHECKING(for /dev/random)
  +AC_MSG_CHECKING(for entropy source)
   
  -if test -r "/dev/random"; then
  -    AC_DEFINE(DEV_RANDOM, [/dev/random])
  -    AC_MSG_RESULT(/dev/random)
  -    rand="1"
  -elif test -r "/dev/urandom"; then
  -    AC_DEFINE(DEV_RANDOM, [/dev/urandom])
  -    AC_MSG_RESULT(/dev/urandom)
  +AC_ARG_WITH(egd, 
  +  [  --with-egd=<path>       use egd-compatible socket],
  +  [ if test "$withval" = "yes"; then
  +      AC_ERROR([You must specify a default EGD socket path.])
  +    fi
  +    AC_DEFINE(HAVE_EGD)
  +    AC_DEFINE_UNQUOTED(EGD_DEFAULT_SOCKET, [$withval])
  +    AC_MSG_RESULT(EGD-compatible daemon)
       rand="1"
  -else
  +  ])
  +
  +if test "$rand" != "1"; then
  +  AC_ARG_WITH(devrandom,
  +    [  --with-devrandom[[=DEV]]  use /dev/random or compatible [[searches by default]]],
  +    [ apr_devrandom="$withval" ], [ apr_devrandom="yes" ])
  +
  +  if test "$apr_devrandom" = "yes"; then
  +    if test -r "/dev/random"; then
  +      AC_DEFINE(DEV_RANDOM, [/dev/random])
  +      AC_MSG_RESULT(/dev/random)
  +      rand="1"
  +    elif test -r "/dev/arandom"; then
  +      AC_DEFINE(DEV_RANDOM, [/dev/arandom])
  +      AC_MSG_RESULT(/dev/arandom)
  +      rand="1"
  +    elif test -r "/dev/urandom"; then
  +      AC_DEFINE(DEV_RANDOM, [/dev/urandom])
  +      AC_MSG_RESULT(/dev/urandom)
  +      rand="1"
  +    fi
  +  elif test "$apr_devrandom" != "no"; then
  +    if test -r "$apr_devrandom"; then
  +      AC_DEFINE(DEV_RANDOM, [$apr_devrandom])
  +      AC_MSG_RESULT($apr_devrandom)
  +      rand="1"
  +    else
  +      AC_ERROR([$apr_devrandom not found or unreadable.])
  +    fi
  +  fi
  +fi
  +
  +if test "$rand" != "1"; then
       case $host in
           # we have built in support for OS/2
           *-os2*)
  @@ -1543,16 +1576,6 @@
               rand="1"
               ;;
           *)
  -            AC_ARG_WITH(egd, 
  -              [  --with-egd=<path>       use egd-compatible socket],
  -              [ if test "$withval" = "yes"; then
  -                  AC_ERROR([You must specify a default EGD socket path.])
  -                fi
  -                AC_DEFINE(HAVE_EGD)
  -                AC_DEFINE_UNQUOTED(EGD_DEFAULT_SOCKET, [$withval])
  -                AC_MSG_RESULT(EGD-compatible daemon)
  -                rand="1"
  -              ])
               if test "$rand" != "1"; then
                 if test "$ac_cv_lib_truerand_main" = "yes"; then
                   AC_DEFINE(HAVE_TRUERAND)
  
  
  

Mime
View raw message