Unconditionally use our own MD5 code. Gets linked only as needed.

diff --git a/Makefile.am b/Makefile.am
index a8848b300e11b01cfbcce7560cfde2a843d4be50..3947e84ea9d916fc588b49616f0915bd92b6fa38 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,7 @@ libfm_a_SOURCES=      xmalloc.c base64.c rfc822.c report.c rfc2047e.c \
                        libesmtp/gethostbyname.h libesmtp/gethostbyname.c \
                        smbtypes.h fm_getaddrinfo.c tls.c rfc822valid.c \
                        xmalloc.h sdump.h sdump.c x509_name_match.c \
-                       fm_strl.h
+                       fm_strl.h md5c.c
 if NTLM_ENABLE
 libfm_a_SOURCES += ntlmsubr.c
 endif

diff --git a/NEWS b/NEWS
index 118e1c1000b05f6438097b5684cb563c3a741463..922bf0f936acaf123318c8f9f0ade33b043f7684 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -54,7 +54,12 @@ removed from a 6.4.0 or newer release.)
 
 --------------------------------------------------------------------------------
 
-not yet released:
+fetchmail-6.3.20 (not yet released):
+
+# CHANGES
+* fetchmail now always uses its own MD5 implementation.  The library and header
+  variants are too diverse, and we've been bitten before -- and configure
+  complains noisily on Cyrus-SASL's RFC1321 md5.h.
 
 # TRANSLATION UPDATES
   [ja]    Japanese (Takeshi Hamasaki)

diff --git a/configure.ac b/configure.ac
index c1d450cd4d7cf33bf22909a9e402192b153dd30d..d95784f78a38b397320c24d57341a0ac2c10b1a2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -73,7 +73,7 @@ AC_TYPE_SIGNAL
 AC_CHECK_HEADERS([unistd.h termios.h termio.h sgtty.h stdarg.h \
        sys/itimer.h fcntl.h sys/fcntl.h memory.h sys/wait.h \
        arpa/inet.h arpa/nameser.h netinet/in.h net/socket.h netdb.h \
-       sys/select.h sys/socket.h sys/time.h langinfo.h md5.h])
+       sys/select.h sys/socket.h sys/time.h langinfo.h])
 if test _$ac_cv_header_stdarg_h != _yes ; then
 AC_MSG_WARN([stdarg.h is not defined. Unsupported configuration, proceed at your own risk.])
 fi
@@ -171,16 +171,6 @@ dnl                [LIBS="$LIBS -lintl"])
 
 AC_REPLACE_FUNCS([strstr strcasecmp memmove stpcpy strlcpy strlcat])
 
-have_md5=no
-if test "$ac_cv_header_md5_h" != no ; then
-    AC_SEARCH_LIBS(MD5Init, [md], [have_md5=yes])
-fi
-
-if test "$have_md5" != yes ; then
-    AC_LIBSOURCE(md5c.c)
-    EXTRAOBJ="$EXTRAOBJ md5c.\$(OBJEXT)"
-fi
-
 AC_CHECK_FUNC(getopt_long, [],
               [AC_LIBSOURCES([getopt.c, getopt1.c])
               EXTRAOBJ="$EXTRAOBJ getopt.\$(OBJEXT) getopt1.\$(OBJEXT)"])