You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2004/03/13 02:24:43 UTC

cvs commit: apr/build apr_common.m4

jorton      2004/03/12 17:24:43

  Modified:    .        configure.in
               build    apr_common.m4
  Log:
  * configure.in, build/apr_common.m4: Remove checks for crypt_r which
  are only necessary in apr-util.
  
  Revision  Changes    Path
  1.575     +0 -4      apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.574
  retrieving revision 1.575
  diff -w -d -u -r1.574 -r1.575
  --- configure.in	13 Mar 2004 00:32:43 -0000	1.574
  +++ configure.in	13 Mar 2004 01:24:42 -0000	1.575
  @@ -848,10 +848,6 @@
   if test "$strerror_r" = "1"; then
     APR_CHECK_STRERROR_R_RC
   fi
  -AC_CHECK_FUNCS(crypt_r, [ crypt_r="1" ], [ crypt_r="0" ])
  -if test "$crypt_r" = "1"; then
  -  APR_CHECK_CRYPT_R_STYLE
  -fi
   AC_CHECK_FUNCS(mmap, [ mmap="1" ], [ mmap="0" ])
   if test "$native_mmap_emul" = "1"; then
       mmap="1"
  
  
  
  1.60      +0 -37     apr/build/apr_common.m4
  
  Index: apr_common.m4
  ===================================================================
  RCS file: /home/cvs/apr/build/apr_common.m4,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -w -d -u -r1.59 -r1.60
  --- apr_common.m4	13 Mar 2004 00:32:43 -0000	1.59
  +++ apr_common.m4	13 Mar 2004 01:24:43 -0000	1.60
  @@ -519,43 +519,6 @@
   fi
   AC_MSG_RESULT([$msg])
   ] )
  -dnl
  -dnl APR_CHECK_CRYPT_R_STYLE
  -dnl
  -dnl  Decide which of a couple of flavors of crypt_r() is necessary for
  -dnl  this platform.
  -dnl
  -AC_DEFUN(APR_CHECK_CRYPT_R_STYLE,[
  -AC_CACHE_CHECK(style of crypt_r, ac_cv_crypt_r_style,[
  -dnl
  -ac_cv_crypt_r_style=none
  -dnl
  -AC_TRY_COMPILE([
  -#include <crypt.h>
  -],[
  -CRYPTD buffer;
  -crypt_r("passwd", "hash", &buffer);
  -], ac_cv_crypt_r_style=cryptd)
  -dnl
  -if test "$ac_cv_crypt_r_style" = "none"; then
  -AC_TRY_COMPILE([
  -#include <crypt.h>
  -],[
  -struct crypt_data buffer;
  -crypt_r("passwd", "hash", &buffer);
  -], ac_cv_crypt_r_style=struct_crypt_data)
  -fi
  -dnl
  -])
  -if test "$ac_cv_crypt_r_style" = "cryptd"; then
  -    AC_DEFINE(CRYPT_R_CRYPTD, 1, [Define if crypt_r has uses CRYPTD])
  -fi
  -# if we don't combine these conditions, CRYPT_R_STRUCT_CRYPT_DATA
  -# will end up defined twice
  -if test "$ac_cv_crypt_r_style" = "struct_crypt_data"; then
  -    AC_DEFINE(CRYPT_R_STRUCT_CRYPT_DATA, 1, [Define if crypt_r uses struct crypt_data])
  -fi
  -])
   
   dnl
   dnl APR_CHECK_DIRENT_INODE