[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  a9fc50f s3: Fix #9037, BSD has -lmd instead of -lmd5
      from  ecf4d5e Fix bug #9098 - winbind does not refresh kerberos tickets.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit a9fc50f9e97d437e18f67f077b0de89b6781e2c3
Author: Volker Lendecke <v...@samba.org>
Date:   Thu Aug 16 20:10:41 2012 +0200

    s3: Fix #9037, BSD has -lmd instead of -lmd5

-----------------------------------------------------------------------

Summary of changes:
 source3/configure.in |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 373396a..11cb33d 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -753,20 +753,29 @@ 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,
-           [
-               LIBS="${LIBS} -lmd5"
-               CRYPTO_MD5_OBJ=
-               AC_DEFINE(HAVE_LIBMD5, 1,
-                   [Whether libmd5 conformant to rfc1321 is available.])],
-           [
-               CRYPTO_MD5_OBJ="../lib/crypto/md5.o"])
+       AC_CHECK_LIB(md5, MD5Update, [samba_cv_md5lib=md5])
+fi
+
+if test x"$ac_cv_header_md5_h" = x"yes" -a \
+        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
+       LIBS="${LIBS} -l${samba_cv_md5lib}"
+       CRYPTO_MD5_OBJ=
+       AC_DEFINE(HAVE_LIBMD5, 1,
+           [Whether libmd5 conformant to rfc1321 is available.])
 else
        CRYPTO_MD5_OBJ="../lib/crypto/md5.o"
 fi
+
 AC_SUBST(CRYPTO_MD5_OBJ)
 
 


-- 
Samba Shared Repository