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:16:24 UTC
cvs commit: apr-util/build apu-conf.m4
jorton 2004/03/12 17:16:24
Modified: . configure.in
build apu-conf.m4
Log:
* build/apu-conf.m4 (APU_CHECK_CRYPT_R_STYLE): Cleaned up version of
APR_CHECK_CRYPT_R_STYLE.
* configure.in: Use it.
Revision Changes Path
1.74 +1 -1 apr-util/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr-util/configure.in,v
retrieving revision 1.73
retrieving revision 1.74
diff -w -d -u -r1.73 -r1.74
--- configure.in 5 Feb 2004 17:37:40 -0000 1.73
+++ configure.in 13 Mar 2004 01:16:24 -0000 1.74
@@ -110,7 +110,7 @@
AC_CHECK_FUNCS(crypt_r, [ crypt_r="1" ], [ crypt_r="0" ])
if test "$crypt_r" = "1"; then
- APR_CHECK_CRYPT_R_STYLE
+ APU_CHECK_CRYPT_R_STYLE
fi
so_ext=$APR_SO_EXT
1.58 +26 -0 apr-util/build/apu-conf.m4
Index: apu-conf.m4
===================================================================
RCS file: /home/cvs/apr-util/build/apu-conf.m4,v
retrieving revision 1.57
retrieving revision 1.58
diff -w -d -u -r1.57 -r1.58
--- apu-conf.m4 28 Aug 2003 17:29:07 -0000 1.57
+++ apu-conf.m4 13 Mar 2004 01:16:24 -0000 1.58
@@ -296,3 +296,29 @@
AC_SUBST(apu_has_ldap)
])
+
+dnl
+dnl APU_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([APU_CHECK_CRYPT_R_STYLE], [
+
+AC_CACHE_CHECK([style of crypt_r], apr_cv_crypt_r_style,
+[AC_TRY_COMPILE([#include <crypt.h>],
+ [CRYPTD buffer;
+ crypt_r("passwd", "hash", &buffer);],
+ [apr_cv_crypt_r_style=cryptd],
+ [AC_TRY_COMPILE([#include <crypt.h>],
+ [struct crypt_data buffer;
+ crypt_r("passwd", "hash", &buffer);],
+ [apr_cv_crypt_r_style=struct_crypt_data],
+ [apr_cv_crypt_r_style=none])])])
+
+if test "$apr_cv_crypt_r_style" = "cryptd"; then
+ AC_DEFINE(CRYPT_R_CRYPTD, 1, [Define if crypt_r has uses CRYPTD])
+elif test "$apr_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
+])