X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=ec8cbac2a74b4643593f574bbbfcc98859627157;hp=ffb06934439b807d7e8a49551e65c73e313d23ed;hb=3af6411b482ed8db2243f3e11bb06cf3adba6936;hpb=a775408e5d2e3b21dff741b89ff5330b397b5138

diff --git a/configure.ac b/configure.ac
index ffb06934..ec8cbac2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,6 +99,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
@@ -209,24 +213,6 @@ AC_MSG_RESULT($have_ip_mreqn)
 if test ${have_ip_mreqn} = yes; then
 	AC_DEFINE(HAVE_IP_MREQN, 1, define to 1 you have struct ip_mreqn)
 fi
-########################################################################### osx
-
-AC_MSG_CHECKING(for CoreAudio (MacOs))
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-	#include <CoreAudio/CoreAudio.h>
-]], [[
-	AudioDeviceID id;
-]])],[have_core_audio=yes],[have_core_audio=no])
-AC_MSG_RESULT($have_core_audio)
-if test ${have_core_audio} = yes; then
-	f1="-framework CoreAudio"
-	f2="-framework AudioToolbox"
-	f3="-framework AudioUnit"
-	f4="-framework CoreServices"
-	core_audio_ldflags="$f1 $f2 $f3 $f4"
-	AC_SUBST(core_audio_ldflags)
-	AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X)
-fi
 ########################################################################### ogg
 STASH_FLAGS
 LIB_ARG_WITH([ogg], [-logg])
@@ -540,10 +526,6 @@ if test -n "$CRYPTOLIB"; then
 	else
 		audiod_errlist_objs="$audiod_errlist_objs gcrypt"
 	fi
-	if test "$have_core_audio" = "yes"; then
-		audiod_errlist_objs="$audiod_errlist_objs osx_write ipc"
-		audiod_cmdline_objs="$audiod_cmdline_objs osx_write"
-	fi
 	NEED_VORBIS_OBJECTS && {
 		audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
 		audiod_audio_formats="$audiod_audio_formats ogg"
@@ -876,10 +858,6 @@ play_cmdline_objs="
 	play
 	sync_filter
 "
-if test "$have_core_audio" = "yes"; then
-	play_errlist_objs="$play_errlist_objs osx_write ipc"
-	play_cmdline_objs="$play_cmdline_objs osx_write"
-fi
 NEED_OGG_OBJECTS && play_errlist_objs="$play_errlist_objs ogg_afh_common"
 NEED_VORBIS_OBJECTS && {
 	play_errlist_objs="$play_errlist_objs oggdec_filter ogg_afh"
@@ -953,12 +931,6 @@ write_errlist_objs="
 writers="file"
 default_writer="FILE_WRITE"
 
-if test "$have_core_audio" = "yes"; then
-	write_errlist_objs="$write_errlist_objs osx_write ipc"
-	write_cmdline_objs="$write_cmdline_objs osx_write"
-	writers="$writers osx"
-	default_writer="OSX_WRITE"
-fi
 NEED_AO_OBJECTS && {
 	write_errlist_objs="$write_errlist_objs ao_write"
 	write_cmdline_objs="$write_cmdline_objs ao_write"