X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=74f3fd97f97cd1228ca76fadbda92bd77b5896bd;hp=953a9d213e5402055d1c22407daae60a292675e0;hb=9165680a9639a8412adef13b96e466efdbb9d806;hpb=de9ce9690ac6194e8e7eaacd10baf21d827e42a4

diff --git a/configure.ac b/configure.ac
index 953a9d21..74f3fd97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -116,6 +116,10 @@ LIB_ARG_WITH([openssl], [-lssl -lcrypto])
 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]))
+fi
 UNSTASH_FLAGS
 ######################################################################### gcrypt
 STASH_FLAGS
@@ -159,12 +163,6 @@ case "$enable_cryptolib" in
 	;;
 esac
 AC_SUBST(crypto_ldflags)
-########################################################################### libsocket
-AC_CHECK_LIB([c], [socket],
-	[socket_ldlflags=],
-	[socket_ldflags="-lsocket"]
-)
-AC_SUBST(socket_ldflags)
 ########################################################################## iconv
 STASH_FLAGS
 LIBS=
@@ -189,12 +187,6 @@ AC_COMPILE_IFELSE([
 AC_DEFINE_UNQUOTED(ICONV_CAST, $cast, [cast for second arg to iconv()])
 AC_MSG_RESULT($msg)
 UNSTASH_FLAGS
-########################################################################### libnsl
-AC_CHECK_LIB([c], [gethostbyname],
-	[nsl_ldflags=],
-	[nsl_ldflags="-lnsl"]
-)
-AC_SUBST(nsl_ldflags)
 ########################################################################### ucred
 AC_MSG_CHECKING(for struct ucred)
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
@@ -430,6 +422,7 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
 		close_on_fork
 		mm
 		crypt_common
+		base64
 		ipc
 		dccp_send
 		fd
@@ -492,6 +485,7 @@ if test -n "$CRYPTOLIB"; then
 		client_common
 		buffer_tree
 		crypt_common
+		base64
 		version
 		ggo
 	"
@@ -535,6 +529,7 @@ if test -n "$CRYPTOLIB"; then
 		stat
 		net
 		crypt_common
+		base64
 		sideband
 		time
 		grab_client