r3330 - trunk/libmcrypto

[mikma at minisip.org]

Author: mikma
Date: 2007-06-17 15:23:54 +0200 (Sun, 17 Jun 2007)
New Revision: 3330

Modified:
   trunk/libmcrypto/configure.ac
Log:
* Fix EVP_sha256 detection in openssl.
* Gnutls supports sha256.


Modified: trunk/libmcrypto/configure.ac
===================================================================
--- trunk/libmcrypto/configure.ac	2007-06-17 09:00:06 UTC (rev 3329)
+++ trunk/libmcrypto/configure.ac	2007-06-17 13:23:54 UTC (rev 3330)
@@ -32,6 +32,7 @@
 
 if test "${with_gnutls}" = "yes"; then
     AM_LIBMCRYPTO_CHECK_GNUTLS([HAVE_GNUTLS=yes],[HAVE_GNUTLS=no])
+    have_sha256=${HAVE_GNUTLS}
 fi
 AM_CONDITIONAL(HAVE_GNUTLS, test "x${HAVE_GNUTLS}" = "xyes")
 
@@ -46,7 +47,10 @@
 
 if test "${with_openssl}" = "yes"; then
     AM_LIBMCRYPTO_CHECK_OPENSSL([HAVE_OPENSSL=yes],[HAVE_OPENSSL=no])
+    save_LIBS=${LIBS}
+    LIBS="${LIBS} ${OPENSSL_LIBS}"
     AC_CHECK_FUNC([EVP_sha256], [have_sha256=yes], [])
+    LIBS=$save_LIBS
 fi
 AM_CONDITIONAL(HAVE_OPENSSL, test "${HAVE_OPENSSL}" = "yes")
 AM_CONDITIONAL(HAVE_EVP_SHA256, test x${have_sha256} = xyes)