From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 21 Nov 2012 07:43:55 +0000 (+0100)
Subject: TODO: s3:configure.in: fix rfc1321 md5 detection
X-Git-Url: http://git.samba.org/?p=metze%2Fsamba%2Fwip.git;a=commitdiff_plain;h=3e6bd5e72e702ebe127008fb1037909f1c678fa4

TODO: s3:configure.in: fix rfc1321 md5 detection
---

diff --git a/source3/configure.in b/source3/configure.in
index 2018a6eb41c8..244a2dc7bd61 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -752,27 +752,26 @@ AC_CHECK_HEADERS(netgroup.h)
 AC_CHECK_HEADERS(linux/falloc.h)
 
 dnl check for OS implementation of md5 conformant to rfc1321
-AC_CHECK_HEADERS(md5.h)
-
 samba_cv_md5lib=none
 
-if test x"$ac_cv_header_md5_h" = x"yes"; then
-	AC_DEFINE(HAVE_MD5_H, 1,
-		[Whether md5.h is available.])
-	AC_CHECK_LIB(md5, MD5Update, [samba_cv_md5lib=md5])
+if x"$samba_cv_md5lib" = x"none" ; then
+	AC_CHECK_LIB(c, MD5Update, [samba_cv_md5lib=""])
 fi
 
-if test x"$ac_cv_header_md5_h" = x"yes" -a \
-        x"$samba_cv_md5lib" = x"none" ; then
+if x"$samba_cv_md5lib" = x"none" ; then
 	AC_CHECK_LIB(md, MD5Update, [samba_cv_md5lib=md])
 fi
 
-if test x"$ac_cv_header_md5_h" = x"yes" -a \
-        x"$samba_cv_md5lib" = x"none" ; then
-	AC_CHECK_LIB(c, MD5Update, [samba_cv_md5lib=""])
+if 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
+
+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}"
 	fi