X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=54f9fe1cfec169fa544d49a673860e2b9c207ca3;hp=499571a70318f2d3bfe753e8a9be95307e7fc378;hb=ddecac81e92694005c8577ea7246caeeefe8361b;hpb=f4019242252bf8e7594a72efdac6214a5abd4364

diff --git a/configure.ac b/configure.ac
index 499571a7..54f9fe1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,8 +96,14 @@ 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])
 fi
 UNSTASH_FLAGS
 ######################################################################### gcrypt
@@ -392,9 +398,10 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes && test -n "$BISON" && \
 		wma_common
 		sideband
 		version
+		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
@@ -420,6 +427,7 @@ if test -n "$CRYPTOLIB"; then
 		net
 		string
 		fd
+		lsu
 		sched
 		stdin
 		stdout
@@ -432,7 +440,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
@@ -486,9 +494,10 @@ if test -n "$CRYPTOLIB"; then
 		wmadec_filter
 		buffer_tree
 		sync_filter
+		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
@@ -543,7 +552,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
@@ -569,6 +578,7 @@ if test $HAVE_CURSES = yes; then
 		fd
 		gui
 		gui_theme
+		lsu
 		time
 		sched
 		version
@@ -593,6 +603,7 @@ filter_errlist_objs="
 	amp_filter
 	fecdec_filter
 	fec
+	lsu
 	version
 	prebuffer_filter
 	time
@@ -722,6 +733,7 @@ play_errlist_objs="
 	file_write
 	version
 	sync_filter
+	lsu
 "
 NEED_OGG_OBJECTS && play_errlist_objs="$play_errlist_objs ogg_afh_common"
 NEED_VORBIS_OBJECTS && {
@@ -793,6 +805,7 @@ AC_SUBST(write_objs, add_dot_o($write_objs))
 audioc_errlist_objs="
 	audioc
 	string
+	lsu
 	net
 	fd
 	version