- simplify configure.in

[tinc] / m4 / openssl.m4

diff --git a/m4/openssl.m4 b/m4/openssl.m4
index 2ef9c37..1a61a8b 100644 (file)
--- a/m4/openssl.m4
+++ b/m4/openssl.m4
@@ -19,23 +19,30 @@ AC_DEFUN(tinc_OPENSSL,
 
   AC_CHECK_HEADERS(openssl/evp.h openssl/rsa.h openssl/rand.h openssl/err.h openssl/sha.h openssl/pem.h,
     [],
-    [AC_MSG_ERROR("OpenSSL header files not found."); break]
+    [AC_MSG_ERROR([OpenSSL header files not found.]); break]
   )
 
   CPPFLAGS="$tinc_ac_save_CPPFLAGS"
 
   AC_CHECK_LIB(crypto, SHA1_version,
     [LIBS="$LIBS -lcrypto"],
-    [AC_MSG_ERROR("OpenSSL libraries not found.")]
+    [AC_MSG_ERROR([OpenSSL libraries not found.])]
   )
 
-  AC_CHECK_FUNCS(RAND_pseudo_bytes)
+  AC_CHECK_FUNCS([RAND_pseudo_bytes EVP_EncryptInit_ex], ,
+    [AC_MSG_ERROR([Missing OpenSSL functionality, make sure you have installed the latest version.]); break],
+  )
+
+  AC_CHECK_DECL([OpenSSL_add_all_algorithms], ,
+    [AC_MSG_ERROR([Missing OpenSSL functionality, make sure you have installed the latest version.]); break],
+    [#include <openssl/evp.h>]
+  )
 
   AC_CHECK_FUNC(dlopen,
     [],
-    AC_CHECK_LIB(dl, dlopen,
+    [AC_CHECK_LIB(dl, dlopen,
       [LIBS="$LIBS -ldl"],
-      [AC_MSG_ERROR("OpenSSL depends on libdl.")]
-    )
+      [AC_MSG_ERROR([OpenSSL depends on libdl.]); break]
+    )]
   )
 ])