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

diff --git a/source3/configure.in b/source3/configure.in
index 2018a6eb41c8b766091ae1cc0eeaeba7ea5891ed..244a2dc7bd61a7386e2797469fb896d505693d1f 100644 (file)
--- 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(linux/falloc.h)
 
 dnl check for OS implementation of md5 conformant to rfc1321

-AC_CHECK_HEADERS(md5.h)
-

 samba_cv_md5lib=none
 
 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
 
 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
 
        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
 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
        if test x"$samba_cv_md5lib" != x ; then
                LIBS="${LIBS} -l${samba_cv_md5lib}"
        fi