X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=m4%2Fopenssl.m4;h=40ad4fd0d220936837e204fc11bf6cdd15308037;hp=2ef9c37853104a993e731e55d8b950710bd38145;hb=8988b127e18435054e48cbcca8ac712ddda3d6d2;hpb=1e2bdc2b6d28c76c63fc9fd36169b90fa0994388

diff --git a/m4/openssl.m4 b/m4/openssl.m4
index 2ef9c378..40ad4fd0 100644
--- a/m4/openssl.m4
+++ b/m4/openssl.m4
@@ -19,23 +19,31 @@ 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_FUNC(OpenSSL_add_all_algorithms,
+    [],
+    [AC_CHECK_FUNC(SSLeay_add_all_algorithms,
+      [AC_DEFINE(HAVE_SSLEAY_ADD_ALL_ALGORITHMS, 1, [Defined if this function should be used instead of OpenSLL_add_all_algorithms])],
+      [AC_MSG_ERROR([Missing required OpenSSL functionality!])]
+    )]
+  )
+
   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.])]
+    )]
   )
 ])