X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=f518f89af154933ffaa64401ba1086b7e3f369c9;hp=3fa685350fab03e8cd96ecc99fac6a414f1a63d4;hb=3685a9093ae12ff9ce02fc58e607eb9b63894443;hpb=15b3fe06afd62f30881db91b7043fdd07ffc9e5f

diff --git a/configure.ac b/configure.ac
index 3fa68535..f518f89a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,8 +96,33 @@ AC_CHECK_HEADER(openssl/ssl.h, [], [HAVE_OPENSSL=no])
 AC_CHECK_LIB([crypto], [RAND_bytes], [], [HAVE_OPENSSL=no])
 LIB_SUBST_FLAGS(openssl)
 if test $HAVE_OPENSSL = yes; then
-	AC_CHECK_LIB([crypto], [RSA_set0_key],
-		AC_DEFINE([HAVE_RSA_SET0_KEY], [1], [openssl-1.1]))
+	HAVE_RSA_SET0_KEY=yes
+	AC_CHECK_DECL([RSA_set0_key], [], [], [#include <openssl/rsa.h>])
+	AC_CHECK_LIB([crypto], [RSA_set0_key], [], [])
+	if test "$ac_cv_have_decl_RSA_set0_key" != "$ac_cv_lib_crypto_RSA_set0_key"; then
+		AC_MSG_ERROR([openssl header/library mismatch])
+	fi
+	test "$ac_cv_have_decl_RSA_set0_key" = yes &&
+		AC_DEFINE([HAVE_RSA_SET0_KEY], [1], [openssl >= 1.1])
+
+	HAVE_CRYPTO_CLEANUP_ALL_EX_DATA=yes
+	AC_CHECK_DECL([CRYPTO_cleanup_all_ex_data], [],
+		[HAVE_CRYPTO_CLEANUP_ALL_EX_DATA=no],
+		[#include <openssl/rsa.h>])
+	AC_CHECK_LIB([crypto], [CRYPTO_cleanup_all_ex_data], [],
+		[HAVE_CRYPTO_CLEANUP_ALL_EX_DATA=no])
+	test $HAVE_CRYPTO_CLEANUP_ALL_EX_DATA = yes &&
+		AC_DEFINE([HAVE_CRYPTO_CLEANUP_ALL_EX_DATA], [1],
+			[not available on FreeBSD 12])
+	HAVE_OPENSSL_THREAD_STOP=yes
+	AC_CHECK_DECL([OPENSSL_thread_stop], [],
+		[HAVE_OPENSSL_THREAD_STOP=no],
+		[#include <openssl/crypto.h>])
+	AC_CHECK_LIB([crypto], [OPENSSL_thread_stop], [],
+		[HAVE_OPENSSL_THREAD_STOP=no])
+	test $HAVE_OPENSSL_THREAD_STOP = yes &&
+		AC_DEFINE([HAVE_OPENSSL_THREAD_STOP], [1],
+			[not available on openssl-1.0])
 fi
 UNSTASH_FLAGS
 ######################################################################### gcrypt
@@ -395,7 +420,7 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes && test -n "$BISON" && \
 		lsu
 	"
 	if test "$CRYPTOLIB" = openssl; then
-		server_errlist_objs="$server_errlist_objs crypt"
+		server_errlist_objs="$server_errlist_objs openssl"
 	else
 		server_errlist_objs="$server_errlist_objs gcrypt"
 	fi
@@ -434,7 +459,7 @@ if test -n "$CRYPTOLIB"; then
 		version
 	"
 	if test "$CRYPTOLIB" = openssl; then
-		client_errlist_objs="$client_errlist_objs crypt"
+		client_errlist_objs="$client_errlist_objs openssl"
 	else
 		client_errlist_objs="$client_errlist_objs gcrypt"
 	fi
@@ -491,7 +516,7 @@ if test -n "$CRYPTOLIB"; then
 		lsu
 	"
 	if test "$CRYPTOLIB" = openssl; then
-		audiod_errlist_objs="$audiod_errlist_objs crypt"
+		audiod_errlist_objs="$audiod_errlist_objs openssl"
 	else
 		audiod_errlist_objs="$audiod_errlist_objs gcrypt"
 	fi
@@ -546,7 +571,7 @@ fi
 if test $HAVE_OSS = yes -o $HAVE_ALSA = yes; then
 	build_mixer="yes"
 	executables="$executables mixer"
-	mixer_errlist_objs="mixer exec string fd version"
+	mixer_errlist_objs="mixer exec string fd lsu version"
 	if test $HAVE_OSS = yes; then
 		mixer_errlist_objs="$mixer_errlist_objs oss_mix"
 	fi
@@ -572,6 +597,7 @@ if test $HAVE_CURSES = yes; then
 		fd
 		gui
 		gui_theme
+		lsu
 		time
 		sched
 		version
@@ -596,6 +622,7 @@ filter_errlist_objs="
 	amp_filter
 	fecdec_filter
 	fec
+	lsu
 	version
 	prebuffer_filter
 	time