[svn] Be more specific when checking for Solaris MD5.

Published in <sxs667ep9bu.fsf@florida.arsdigita.de>.

diff --git a/ChangeLog b/ChangeLog
index c79a1a2d0dbf567225e19a698e3912b8eac757d7..eb7163029503a08b2d945ec178099ed76316048b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-11  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+       * configure.in: Check for md5_calc rather than MD5Update when
+       looking for Solaris md5.
+
 2001-12-08  R.I.P. Deaddog  <maddog@linuxhall.org>
 
        * po/zh_TW.po: Updated for 1.8.

diff --git a/configure.in b/configure.in
index 372759b9bad32025bcd8175f1add7ffaaf7c18a3..d3e2761865077fb7b2ecc6a1e0e18129b5b32106 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -340,18 +340,18 @@ dnl
 dnl Find an md5 implementation.
 dnl
 
-dnl On Solaris, we use libmd5.  If we're compiled with OpenSSL, use
-dnl OpenSSL's md5 support.  Otherwise, use our own md5.
-
 if test x$wget_need_md5 = xyes
 then
   MD5_OBJ='gen-md5$o'
 
   found_md5=no
 
-  dnl First check for Solaris md5.
+  dnl Check for the system MD5 library on Solaris.  We don't check for
+  dnl something simple like "MD5Update" because there are a number of
+  dnl MD5 implementations that use that name.  md5_calc is, hopefully,
+  dnl specific to the Solaris MD5 library.
   if test x$found_md5 = xno; then
-    AC_CHECK_LIB(md5, MD5Update, [
+    AC_CHECK_LIB(md5, md5_calc, [
       AC_DEFINE(HAVE_SOLARIS_MD5)
       LIBS="-lmd5 $LIBS"
       found_md5=yes