>From 9c9130a1a1e51fcd6d00c3cfec1e9ea9c39eaa57 Mon Sep 17 00:00:00 2001 From: Matthieu Patou Date: Wed, 21 Nov 2012 12:07:42 -0800 Subject: [PATCH] Fix MD5 detection in the autoconf build This is a front port of patches made in 3.6.x branch for bugs: * 9037 * 9086 * 9094 It checks if there is a library for md5 related functions (libmd or libmd5) and if so it checks for the presence of md5.h headers it also respect the need for osX build to not use samba's md5 implementation as it's already present in the system libs. Initial credit for the fix goes to Stefan Metzmacher (metze@samba.org) Signed-off-by: Matthieu Patou --- source3/configure.in | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/source3/configure.in b/source3/configure.in index 179d12d..9e57893 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -610,18 +610,45 @@ AC_CHECK_HEADERS(netgroup.h) AC_CHECK_HEADERS(linux/falloc.h) AC_CHECK_HEADERS(CommonCrypto/CommonDigest.h) +dnl check for OS implementation of md5 conformant to rfc1321 +samba_cv_md5lib=none + +AC_CHECK_LIB(c, MD5Update, [samba_cv_md5lib=""]) + +if test x"$samba_cv_md5lib" = x"none" ; then + AC_CHECK_LIB(md, MD5Update, [samba_cv_md5lib=md]) +fi + +if test x"$samba_cv_md5lib" = x"none" ; then + AC_CHECK_LIB(md5, MD5Update, [samba_cv_md5lib=md5]) +fi + +if test x"$samba_cv_md5lib" != x"none" ; then + AC_CHECK_HEADERS(md5.h) +fi + +CRYPTO_MD5_OBJ="../lib/crypto/md5.o" +if test x"$ac_cv_header_md5_h" = x"yes" -a \ + x"$samba_cv_md5lib" = x"none" ; then + if test x"$samba_cv_md5lib" != x ; then + LIBS="${LIBS} -l${samba_cv_md5lib}" + AC_DEFINE(HAVE_LIBMD5, 1, + [Whether libmd5 conformant to rfc1321 is available.]) + fi + CRYPTO_MD5_OBJ= +fi + +if test "x$ac_cv_header_CommonCrypto_CommonDigest_h" == "xyes"; then + CRYPTO_MD5_OBJ= +fi + +AC_SUBST(CRYPTO_MD5_OBJ) + AC_CHECK_HEADERS(rpcsvc/yp_prot.h,,,[[ #if HAVE_RPC_RPC_H #include #endif ]]) -CRYPTO_MD5_OBJ= -if test "x$ac_cv_header_CommonCrypto_CommonDigest_h" != "xyes" -then - CRYPTO_MD5_OBJ="../lib/crypto/md5.o" -fi -AC_SUBST(CRYPTO_MD5_OBJ) - ## These fail to compile on IRIX so just check for their presence AC_CHECK_HEADERS(sys/mode.h,,,) -- 1.7.9.5