r3474 - in trunk/libmcrypto: . m4 source/openssl

[mikma at minisip.org]

Author: mikma
Date: 2007-11-17 20:09:51 +0100 (Sat, 17 Nov 2007)
New Revision: 3474

Modified:
   trunk/libmcrypto/configure.ac
   trunk/libmcrypto/m4/libmcrypto.m4
   trunk/libmcrypto/source/openssl/Makefile.am
Log:
Fix DTLS automake conditional.


Modified: trunk/libmcrypto/configure.ac
===================================================================
--- trunk/libmcrypto/configure.ac	2007-11-17 17:06:08 UTC (rev 3473)
+++ trunk/libmcrypto/configure.ac	2007-11-17 19:09:51 UTC (rev 3474)
@@ -52,8 +52,11 @@
     LIBS="${LIBS} ${OPENSSL_LIBS}"
     AC_CHECK_FUNC([EVP_sha256], [have_sha256=yes], [])
     LIBS=$save_LIBS
+
+    AM_LIBMCRYPTO_CHECK_OPENSSL_DTLS([HAVE_OPENSSL_DTLS=yes],[HAVE_OPENSSL_DTLS=no])
 fi
 AM_CONDITIONAL(HAVE_OPENSSL, test "${HAVE_OPENSSL}" = "yes")
+AM_CONDITIONAL(HAVE_OPENSSL_DTLS, test "${HAVE_OPENSSL_DTLS}" = "yes")
 AM_CONDITIONAL(HAVE_EVP_SHA256, test x${have_sha256} = xyes)
 
 AC_ARG_ENABLE(scsim,

Modified: trunk/libmcrypto/m4/libmcrypto.m4
===================================================================
--- trunk/libmcrypto/m4/libmcrypto.m4	2007-11-17 17:06:08 UTC (rev 3473)
+++ trunk/libmcrypto/m4/libmcrypto.m4	2007-11-17 19:09:51 UTC (rev 3474)
@@ -62,6 +62,25 @@
 	ifelse([$2], , :, [$2])
 fi
 
+dnl AM_CONDITIONAL(HAVE_OPENSSL, test "x${HAVE_OPENSSL}" = "x1")
+
+LIBS="${mcrypto_save_LIBS}"
+CPPFLAGS="${mcrypto_save_CPPFLAGS}"
+
+])
+# End of AM_LIBMCRYPTO_CHECK_OPENSSL
+#
+
+# AM_LIBMCRYPTO_CHECK_OPENSSL_DTLS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+# -----------------------------
+AC_DEFUN([AM_LIBMCRYPTO_CHECK_OPENSSL_DTLS], [
+dnl OpenSSL DTLS
+
+mcrypto_save_LIBS="${LIBS}"
+LIBS="${OPENSSL_LIBS} ${LIBS}"
+mcrypto_save_CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS="${CPPFLAGS} ${OPENSSL_CFLAGS}"
+
 dnl Check for DTLS, requires OpenSSL 0.9.8f or later.
 have_dtls=yes
 AC_CHECK_HEADER([openssl/dtls1.h], , [have_dtls=no], [
@@ -69,7 +88,7 @@
 ])
 
 dnl Check DTLS version magic
-AC_MSG_CHECKING([DTLS version 1.0])
+AC_MSG_CHECKING([for DTLS version 1.0])
 AC_COMPILE_IFELSE([
 #include<openssl/ssl.h>
 #include<openssl/dtls1.h>
@@ -91,17 +110,18 @@
 
 AC_CHECK_FUNC([DTLSv1_method], , [have_dtls=no])
 if test x$have_dtls = xyes; then
-        AC_DEFINE(USE_DTLS, [], [DTLS transport enabled])
+	AC_DEFINE([USE_DTLS], 1, [Define to 1 if you have OpenSSL 0.9.8f or later])
+	ifelse([$1], , :, [$1])
+else
+	ifelse([$2], , :, [$2])
 fi
-AM_CONDITIONAL(USE_DTLS, test x$have_dtls = xyes)
 
 dnl AM_CONDITIONAL(HAVE_OPENSSL, test "x${HAVE_OPENSSL}" = "x1")
 
 LIBS="${mcrypto_save_LIBS}"
 CPPFLAGS="${mcrypto_save_CPPFLAGS}"
-
 ])
-# End of AM_LIBMCRYPTO_CHECK_OPENSSL
+# End of AM_LIBMCRYPTO_CHECK_OPENSSL_DTLS
 #
 
 AC_DEFUN([AM_LIBMCRYPTO_CHECK_SCSIM], [

Modified: trunk/libmcrypto/source/openssl/Makefile.am
===================================================================
--- trunk/libmcrypto/source/openssl/Makefile.am	2007-11-17 17:06:08 UTC (rev 3473)
+++ trunk/libmcrypto/source/openssl/Makefile.am	2007-11-17 19:09:51 UTC (rev 3474)
@@ -7,7 +7,7 @@
 OTHER_FILES += hmac256.cxx sha256.cxx
 endif
 
-if USE_DTLS
+if HAVE_OPENSSL_DTLS
 OTHER_FILES += DtlsSocket.cxx DtlsSocket.h
 endif