X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=7224e4e6cc415f5555105b5795e74da3a546d05b;hp=4d0501b5534df5d9dc4b8bc195c4f0e20199d28d;hb=b9bc5f8624c347797194edadde10a68ab24b1daa;hpb=6c632dfdbeab2b583aca0be29b7c7b3620a97f07

diff --git a/configure.ac b/configure.ac
index 4d0501b5..7224e4e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,13 +3,68 @@
 
 AC_PREREQ([2.61])
 
-AC_INIT([paraslash],[git],[maan@systemlinux.org])
-AC_CONFIG_HEADER([config.h])
+AC_INIT([paraslash], [m4_esyscmd_s(./GIT-VERSION-GEN)],
+	[maan@tuebingen.mpg.de], [], [http://people.tuebingen.mpg.de/maan/paraslash/])
+AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_FILES([Makefile])
 AC_DEFUN([add_dot_o],[$(for i in $@; do printf "$i.o "; done)])
 AC_DEFUN([add_cmdline],[$(for i in $@; do printf "${i}.cmdline "; done)])
-AC_DEFUN([objlist_to_errlist],[$(for i in $@; do printf "DEFINE_ERRLIST($(echo $i| tr 'a-z' 'A-Z'));"; done) [const char **para_errlist[[]]] = {$(for i in $@; do printf "PARA_ERRLIST($(echo $i | tr 'a-z' 'A-Z')), "; done) }])
+AC_DEFUN([make_errlist_defines], \
+	$(for i in $@; do \
+		printf "DEFINE_ERRLIST($(echo $i | tr 'a-z' 'A-Z'));"; \
+	done) \
+)
+AC_DEFUN([make_para_errlists], \
+	$(for i in $@; do \
+		printf "PARA_ERRLIST($(echo $i | tr 'a-z' 'A-Z')), "; \
+	done) \
+)
+AC_DEFUN([objlist_to_errlist],[ \
+	make_errlist_defines($@) \
+	[const char **para_errlist[[]]] = {make_para_errlists($@)} \
+])
+AC_DEFUN([LIB_ARG_WITH], [
+	AC_ARG_WITH($1-headers, [AS_HELP_STRING(--with-$1-headers=dir,
+		[look for $1 headers in dir])])
+	AC_ARG_WITH($1-libs, [AS_HELP_STRING(--with-$1-libs=dir,
+		[look for $1 libraries in dir])])
+	if test -n "$with_$1_headers"; then
+		$1_cppflags="-I$with_$1_headers"
+		CPPFLAGS="$CPPFLAGS $$1_cppflags"
+	fi
+	if test -n "$with_$1_libs"; then
+		$1_ldflags="-L$with_$1_libs $2"
+	else
+		$1_ldflags="$2"
+	fi
+	LDFLAGS="$LDFLAGS $$1_ldflags"
+])
+
+AC_DEFUN([STASH_FLAGS], [
+	OLD_CPPFLAGS="$CPPFLAGS"
+	OLD_LDFLAGS="$LDFLAGS"
+	OLD_LIBS="$LIBS"
+])
+
+AC_DEFUN([UNSTASH_FLAGS], [
+	CPPFLAGS="$OLD_CPPFLAGS"
+	LDFLAGS="$OLD_LDFLAGS"
+	LIBS="$OLD_LIBS"
+])
+AC_DEFUN([LIB_SUBST_FLAGS], [
+	if test "$HAVE_[]m4_toupper([$1])" == 'yes'; then
+		AC_DEFINE(HAVE_[]m4_toupper([$1]), 1,
+			define to 1 to turn on $1 support)
+	else
+		$1_cppflags=
+		$1_ldflags=
+	fi
+	AC_SUBST(HAVE_[]m4_toupper([$1]))
+	AC_SUBST($1_cppflags)
+	AC_SUBST($1_ldflags)
+])
+
 AC_PATH_PROG(UNAMEPATH, uname, no)
 if test "$UNAMEPATH" = "no"; then
 	AC_MSG_ERROR(unable to determine system type)
@@ -41,220 +96,7 @@ test -z "$install" && AC_MSG_ERROR(
 AC_PROG_CC
 AC_PROG_CPP
 
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_HEADER_STDBOOL
-AC_CHECK_HEADERS([arpa/inet.h ctype.h fcntl.h limits.h netdb.h netinet/in.h \
-	stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h sys/un.h \
-	sys/ipc.h unistd.h utime.h stddef.h],
-	[], [AC_MSG_ERROR([$ac_header not found])])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_C_INLINE
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_HEADER_TIME
-AC_STRUCT_TM
-AC_TYPE_INT8_T
-AC_TYPE_INT16_T
-AC_TYPE_INT32_T
-AC_TYPE_INT64_T
-AC_TYPE_MODE_T
-AC_TYPE_SSIZE_T
-AC_TYPE_UID_T
-AC_TYPE_UINT8_T
-AC_TYPE_UINT16_T
-AC_TYPE_UINT32_T
-AC_TYPE_UINT64_T
-
-# Checks for library functions.
-AC_FUNC_FORK
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MEMCMP
-AC_FUNC_MKTIME
-AC_FUNC_MMAP
-AC_FUNC_SELECT_ARGTYPES
-AC_FUNC_STAT
-AC_FUNC_STRFTIME
-AC_FUNC_VPRINTF
-AC_FUNC_CLOSEDIR_VOID
-AC_FUNC_LSTAT
-
-AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
-	regcomp select strchr strdup strerror strstr strtol uname \
-	fchdir gettimeofday localtime_r munmap strcasecmp strcspn \
-	strncasecmp strrchr strspn alarm mkdir inet_ntoa socket], [],
-	[AC_MSG_ERROR([function not found, cannot live without it])])
-
 executables="recv filter audioc write afh play"
-audio_format_handlers="mp3 wma"
-
-recv_cmdline_objs="
-	recv
-	http_recv
-	dccp_recv
-	udp_recv
-	afh_recv
-"
-
-recv_errlist_objs="
-	http_recv
-	recv_common
-	recv
-	time
-	string
-	net
-	dccp_recv
-	fd
-	sched
-	stdout
-	ggo
-	udp_recv
-	buffer_tree
-	afh_recv
-	afh_common
-	wma_afh
-	wma_common
-	mp3_afh
-	version
-"
-
-recv_ldflags=""
-
-filter_cmdline_objs="
-	filter
-	compress_filter
-	amp_filter
-	prebuffer_filter
-"
-filter_errlist_objs="
-	filter_common
-	wav_filter
-	compress_filter
-	filter
-	string
-	stdin
-	stdout
-	sched
-	fd
-	amp_filter
-	ggo
-	fecdec_filter
-	fec
-	version
-	prebuffer_filter
-	time
-	bitstream
-	imdct
-	wma_common
-	wmadec_filter
-	buffer_tree
-"
-filter_ldflags="-lm"
-filters="
-	compress
-	wav
-	amp
-	fecdec
-	wmadec
-	prebuffer
-"
-
-audioc_cmdline_objs="audioc"
-audioc_errlist_objs="
-	audioc
-	string
-	net
-	fd
-	version
-	ggo
-"
-audioc_ldflags=""
-
-afh_cmdline_objs="afh"
-afh_errlist_objs="
-	afh
-	string
-	fd
-	mp3_afh
-	afh_common
-	time
-	wma_afh
-	wma_common
-	version
-	ggo
-"
-afh_ldflags=""
-
-write_cmdline_objs="
-	write
-	file_write
-"
-write_errlist_objs="
-	write
-	write_common
-	file_write
-	time
-	fd
-	string
-	sched
-	stdin
-	buffer_tree
-	ggo
-	check_wav
-	version
-"
-write_ldflags=""
-writers="file"
-default_writer="FILE_WRITE"
-
-play_errlist_objs="
-	play
-	fd
-	sched
-	ggo
-	buffer_tree
-	time
-	string
-	net
-	afh_recv
-	afh_common
-	wma_afh
-	wma_common
-	mp3_afh
-	recv_common
-	udp_recv
-	http_recv
-	dccp_recv
-	filter_common
-	fec
-	bitstream
-	imdct
-	wav_filter
-	compress_filter
-	amp_filter
-	prebuffer_filter
-	fecdec_filter
-	wmadec_filter
-	write_common
-	file_write
-	version
-"
-play_cmdline_objs="
-	http_recv
-	dccp_recv
-	udp_recv
-	afh_recv
-	compress_filter
-	amp_filter
-	prebuffer_filter
-	file_write
-	play
-"
-play_ldflags="-lm"
 ################################################################## clock_gettime
 clock_gettime_lib=
 AC_CHECK_LIB([c], [clock_gettime], [clock_gettime_lib=c], [
@@ -267,39 +109,32 @@ fi
 if test "$clock_gettime_lib" = "rt"; then
 	AC_SUBST(clock_gettime_ldflags, -lrt)
 fi
-########################################################################### osl
-have_osl=yes
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-AC_ARG_WITH(osl_headers, [AS_HELP_STRING(--with-osl-headers=dir,
-	[look for osl.h also in dir])])
-if test -n "$with_osl_headers"; then
-	osl_cppflags="-I$with_osl_headers"
-	CPPFLAGS="$CPPFLAGS $osl_cppflags"
-fi
-AC_ARG_WITH(osl_libs, [AS_HELP_STRING(--with-osl-libs=dir,
-	[look for libosl also in dir])])
-if test -n "$with_osl_libs"; then
-	osl_libs="-L$with_osl_libs"
-	LDFLAGS="$LDFLAGS $osl_libs"
-fi
 
-AC_CHECK_HEADER(osl.h, [], have_osl=no)
-AC_CHECK_LIB([osl], [osl_open_table], [], have_osl=no)
-if test "$have_osl" = "no"; then
-	AC_MSG_WARN([libosl not found, can not build para_server.
-Download libosl at
-	http://systemlinux.org/~maan/osl
-or execute
-	git clone git://git.tuebingen.mpg.de/osl
-	])
-fi
-AC_SUBST(osl_cppflags)
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
-########################################################################### crypto
+########################################################################### osl
+STASH_FLAGS
+LIB_ARG_WITH([osl], [-losl])
+HAVE_OSL=yes
+AC_CHECK_HEADER(osl.h, [], [HAVE_OSL=no])
+AC_CHECK_LIB([osl], [osl_open_table], [], [HAVE_OSL=no])
+LIB_SUBST_FLAGS(osl)
+UNSTASH_FLAGS
+######################################################################## openssl
+STASH_FLAGS
+HAVE_OPENSSL=yes
+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)
+UNSTASH_FLAGS
+######################################################################### gcrypt
+STASH_FLAGS
+HAVE_GCRYPT=yes
+LIB_ARG_WITH([gcrypt], [-lgcrypt])
+AC_CHECK_HEADER(gcrypt.h, [], [HAVE_GCRYPT=no])
+AC_CHECK_LIB([gcrypt], [gcry_randomize], [], [HAVE_GCRYPT=no])
+LIB_SUBST_FLAGS(gcrypt)
+UNSTASH_FLAGS
+######################################################################### crypto
 AC_ARG_ENABLE(cryptolib, [AS_HELP_STRING(--enable-cryptolib=lib, [
 	Force using crypto library "lib". This package requires either
 	openssl or libgcrypt being installed. Possible values for "lib"
@@ -307,133 +142,44 @@ AC_ARG_ENABLE(cryptolib, [AS_HELP_STRING(--enable-cryptolib=lib, [
 	openssl is tried first. If openssl was not found, gcrypt is
 	tried next.])])
 
+CRYPTOLIB="$enable_cryptolib"
 case "$enable_cryptolib" in
-	"openssl") check_openssl="yes"; check_gcrypt="no";;
-	"gcrypt") check_openssl="no"; check_gcrypt="yes";;
-	"") check_openssl="yes"; check_gcrypt="yes";;
-	*) AC_MSG_ERROR([invalid value "$enable_cryptolib" for --enable-cryptolib]);;
-esac
-###################################################################### openssl
-if test "$check_openssl" = "yes"; then
-	OLD_CPPFLAGS="$CPPFLAGS"
-	OLD_LDFLAGS="$LDFLAGS"
-	OLD_LIBS="$LIBS"
-	have_openssl="yes"
-	AC_ARG_WITH(openssl_headers, [AS_HELP_STRING(--with-openssl-headers=dir,
-		[look for openssl headers also in dir])])
-	if test -n "$with_openssl_headers"; then
-		openssl_cppflags="-I$with_openssl_headers"
-		CPPFLAGS="$CPPFLAGS $openssl_cppflags"
-	fi
-	AC_ARG_WITH(openssl_libs, [AS_HELP_STRING(--with-openssl-libs=dir,
-		[look for openssl libraries also in dir])])
-	if test -n "$with_openssl_libs"; then
-		openssl_libs="-L$with_openssl_libs"
-		LDFLAGS="$LDFLAGS $openssl_libs"
-	fi
-	AC_CHECK_HEADER(openssl/ssl.h, [], [have_openssl="no"])
-	AC_CHECK_LIB([crypto], [RAND_bytes], [], [have_openssl="no"])
-	if test "$have_openssl" = "no" -a -z "$with_openssl_headers$with_openssl_libs"; then
-		# try harder: openssl is sometimes installed in /usr/local/ssl
-		openssl_cppflags="-I/usr/local/ssl/include"
-		CPPFLAGS="$CPPFLAGS $openssl_cppflags"
-		openssl_libs="-L/usr/local/ssl/lib"
-		LDFLAGS="$LDFLAGS $openssl_libs"
-		# clear cache
-		unset ac_cv_header_openssl_ssl_h 2> /dev/null
-		unset ac_cv_lib_crypto_RAND_bytes 2> /dev/null
-		AC_CHECK_HEADER(openssl/ssl.h, [have_openssl="yes"], [])
-		if test "$have_openssl" = "yes"; then
-			AC_CHECK_LIB([crypto], [RAND_bytes], [], [have_openssl="no"])
-		fi
-	fi
-	if test "$have_openssl" = "yes"; then
-		AC_DEFINE(HAVE_OPENSSL, 1, [define to 1 to turn on openssl support])
-		AC_SUBST(openssl_cppflags)
-		openssl_libs="$openssl_libs -lssl -lcrypto"
-		server_ldflags="$server_ldflags $openssl_libs"
-		client_ldflags="$client_ldflags $openssl_libs"
-		audiod_ldflags="$audiod_ldflags $openssl_libs"
-
-		server_errlist_objs="$server_errlist_objs crypt"
-		client_errlist_objs="$client_errlist_objs crypt"
-		audiod_errlist_objs="$audiod_errlist_objs crypt"
-
-		check_gcrypt="no"
-	else
-		AC_MSG_WARN([openssl libraries not found])
+"openssl")
+	test $HAVE_OPENSSL = no && AC_MSG_ERROR(openssl not found)
+	crypto_ldflags="$openssl_ldflags"
+	;;
+"gcrypt")
+	test $HAVE_GCRYPT = no && AC_MSG_ERROR(gcrypt not found)
+	crypto_ldflags="$gcrypt_ldflags"
+	;;
+"")
+	crypto_ldflags=
+	if test $HAVE_GCRYPT = yes; then
+		CRYPTOLIB=gcrypt
+		crypto_ldflags="$gcrypt_ldflags"
 	fi
-	CPPFLAGS="$OLD_CPPFLAGS"
-	LDFLAGS="$OLD_LDFLAGS"
-	LIBS="$OLD_LIBS"
-else
-	have_openssl="no"
-fi
-########################################################################### gcrypt
-if test "$check_gcrypt" = "yes"; then
-	OLD_CPPFLAGS="$CPPFLAGS"
-	OLD_LDFLAGS="$LDFLAGS"
-	OLD_LIBS="$LIBS"
-	have_gcrypt="yes"
-	AC_ARG_WITH(gcrypt_headers, [AS_HELP_STRING(--with-gcrypt-headers=dir,
-		[look for gcrypt headers also in dir])])
-	if test -n "$with_gcrypt_headers"; then
-		gcrypt_cppflags="-I$with_gcrypt_headers"
-		CPPFLAGS="$CPPFLAGS $gcrypt_cppflags"
+	if test $HAVE_OPENSSL = yes; then
+		CRYPTOLIB=openssl
+		crypto_ldflags="$openssl_ldflags"
 	fi
-	AC_ARG_WITH(gcrypt_libs, [AS_HELP_STRING(--with-gcrypt-libs=dir,
-		[look for libgcrypt also in dir])])
-	if test -n "$with_gcrypt_libs"; then
-		gcrypt_libs="-L$with_gcrypt_libs"
-		LDFLAGS="$LDFLAGS $gcrypt_libs"
-	fi
-	AC_CHECK_HEADER(gcrypt.h, [], [have_gcrypt="no"])
-	AC_CHECK_LIB([gcrypt], [gcry_randomize], [], [have_gcrypt="no"])
-	if test "$have_gcrypt" = "yes"; then
-		AC_DEFINE(HAVE_GCRYPT, 1, [define to 1 to turn on gcrypt support])
-		AC_SUBST(gcrypt_cppflags)
-		gcrypt_libs="$gcrypt_libs -lgcrypt"
-		server_ldflags="$server_ldflags $gcrypt_libs"
-		client_ldflags="$client_ldflags $gcrypt_libs"
-		audiod_ldflags="$audiod_ldflags $gcrypt_libs"
-
-		server_errlist_objs="$server_errlist_objs gcrypt"
-		client_errlist_objs="$client_errlist_objs gcrypt"
-		audiod_errlist_objs="$audiod_errlist_objs gcrypt"
-	else
-		AC_MSG_WARN([gcrypt library not found])
-	fi
-	CPPFLAGS="$OLD_CPPFLAGS"
-	LDFLAGS="$OLD_LDFLAGS"
-	LIBS="$OLD_LIBS"
-else
-	have_gcrypt="no"
-fi
+	;;
+*)
+	AC_MSG_ERROR([invalid value "$enable_cryptolib" for --enable-cryptolib])
+	;;
+esac
+AC_SUBST(crypto_ldflags)
 ########################################################################### libsocket
 AC_CHECK_LIB([c], [socket],
-	[socket_lib=],
-	[socket_lib="-lsocket"]
+	[socket_ldlflags=],
+	[socket_ldflags="-lsocket"]
 )
-server_ldflags="$server_ldflags $socket_lib"
-client_ldflags="$client_ldflags $socket_lib"
-audioc_ldflags="$audioc_ldflags $socket_lib"
-audiod_ldflags="$audiod_ldflags $socket_lib"
-recv_ldflags="$recv_ldflags $socket_lib"
-AC_SEARCH_LIBS([connect],[socket],[],[
-	AC_MSG_ERROR([Fatal: Did not find connect().])
-],[])
+AC_SUBST(socket_ldflags)
 ########################################################################### libnsl
 AC_CHECK_LIB([c], [gethostbyname],
-	[nsl_lib=],
-	[nsl_lib="-lnsl"]
+	[nsl_ldflags=],
+	[nsl_ldflags="-lnsl"]
 )
-server_ldflags="$server_ldflags $nsl_lib"
-client_ldflags="$client_ldflags $nsl_lib"
-audioc_ldflags="$audioc_ldflags $nsl_lib"
-recv_ldflags="$recv_ldflags $nsl_lib"
-AC_SEARCH_LIBS([inet_ntoa],[nsl],[],[
-	AC_MSG_ERROR([Fatal: Did not find inet_ntoa().])
-],[])
+AC_SUBST(nsl_ldflags)
 ########################################################################### ucred
 AC_MSG_CHECKING(for struct ucred)
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
@@ -517,234 +263,85 @@ if test ${have_core_audio} = yes; then
 	f2="-framework AudioToolbox"
 	f3="-framework AudioUnit"
 	f4="-framework CoreServices"
-	f="$f1 $f2 $f3 $f4"
-
-	audiod_errlist_objs="$audiod_errlist_objs osx_write ipc"
-	audiod_cmdline_objs="$audiod_cmdline_objs osx_write.cmdline"
-	audiod_ldflags="$audiod_ldflags $f"
-
-	play_errlist_objs="$play_errlist_objs osx_write ipc"
-	play_cmdline_objs="$play_cmdline_objs osx_write.cmdline"
-	play_ldflags="$play_ldflags $f"
-
-	write_errlist_objs="$write_errlist_objs osx_write ipc"
-	write_cmdline_objs="$write_cmdline_objs osx_write.cmdline"
-	write_ldflags="$write_ldflags $f"
-	writers="$writers osx"
-	default_writer="OSX_WRITE"
+	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/vorbis/speex/opus
-have_ogg="yes"
+########################################################################### ogg
+STASH_FLAGS
+LIB_ARG_WITH([ogg], [-logg])
+HAVE_OGG=yes
+AC_CHECK_HEADERS([ogg/ogg.h], [], [HAVE_OGG=no])
+AC_CHECK_LIB([ogg], [ogg_stream_init], [], [HAVE_OGG=no])
+LIB_SUBST_FLAGS(ogg)
+UNSTASH_FLAGS
+######################################################################### vorbis
+STASH_FLAGS
+LIB_ARG_WITH([vorbis], [-lvorbis -lvorbisfile])
+HAVE_VORBIS=yes
+AC_CHECK_HEADERS([vorbis/codec.h], [], [HAVE_VORBIS=no])
+AC_CHECK_LIB([vorbis], [vorbis_info_init], [], [HAVE_VORBIS=no])
+LIB_SUBST_FLAGS(vorbis)
+UNSTASH_FLAGS
+######################################################################### speex
+STASH_FLAGS
+LIB_ARG_WITH([speex], [-lspeex])
+HAVE_SPEEX=yes
+AC_CHECK_HEADERS([speex/speex.h], [], [HAVE_SPEEX=no])
+AC_CHECK_LIB([speex], [speex_decoder_init], [], [HAVE_SPEEX=no])
+LIB_SUBST_FLAGS(speex)
+UNSTASH_FLAGS
+######################################################################### opus
+STASH_FLAGS
+LIB_ARG_WITH([opus], [-lopus])
+HAVE_OPUS=yes
+AC_CHECK_HEADERS([opus/opus.h], [], [HAVE_OPUS=no])
+AC_CHECK_LIB([opus], [opus_multistream_decode], [], [HAVE_OPUS=no])
+LIB_SUBST_FLAGS(opus)
+UNSTASH_FLAGS
+
+# some helper functions for codecs which use the ogg container format
+AC_DEFUN([NEED_OGG_OBJECTS], [{
+	test "$HAVE_OGG" = 'yes' -a \( \
+		 "$HAVE_VORBIS" = 'yes' \
+		-o "$HAVE_SPEEX" = 'yes' \
+		-o "$HAVE_OPUS" = 'yes' \
+	\)
+}])
+AC_DEFUN([NEED_VORBIS_OBJECTS], [{
+	test "$HAVE_OGG" = 'yes' -a "$HAVE_VORBIS" = 'yes'
+}])
+AC_DEFUN([NEED_SPEEX_OBJECTS], [{
+	test "$HAVE_OGG" = 'yes' -a "$HAVE_SPEEX" = 'yes'
+}])
+AC_DEFUN([NEED_OPUS_OBJECTS], [{
+	test "$HAVE_OGG" = 'yes' -a "$HAVE_OPUS" = 'yes'
+}])
+########################################################################### faad
+STASH_FLAGS
+LIB_ARG_WITH([faad], [-lfaad])
+HAVE_FAAD=yes
+AC_CHECK_HEADER(neaacdec.h, [], HAVE_FAAD=no)
+AC_CHECK_LIB([faad], [NeAACDecOpen], [], HAVE_FAAD=no)
+LIB_SUBST_FLAGS(faad)
+UNSTASH_FLAGS
+########################################################################### mad
+have_mad="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
 OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
-AC_ARG_WITH(ogg_headers, [AS_HELP_STRING(--with-ogg-headers=dir,
-	[look for ogg headers also in dir])])
-AC_ARG_WITH(ogg_libs, [AS_HELP_STRING(--with-ogg-libs=dir,
-	[look for ogg libs also in dir])])
-AC_ARG_WITH(vorbis_headers, [AS_HELP_STRING(--with-vorbis-headers=dir,
-	[look for vorbis headers also in dir])])
-AC_ARG_WITH(vorbis_libs, [AS_HELP_STRING(--with-vorbis-libs=dir,
-	[look for vorbis libs also in dir])])
-AC_ARG_WITH(speex_headers, [AS_HELP_STRING(--with-speex-headers=dir,
-	[look for speex headers also in dir])])
-AC_ARG_WITH(speex_libs, [AS_HELP_STRING(--with-speex-libs=dir,
-	[look for speex libs also in dir])])
-AC_ARG_WITH(opus_headers, [AS_HELP_STRING(--with-opus-headers=dir,
-	[look for opus headers also in dir])])
-AC_ARG_WITH(opus_libs, [AS_HELP_STRING(--with-opus-libs=dir,
-	[look for opus libs also in dir])])
 
-if test -n "$with_ogg_headers"; then
-	ogg_cppflags="-I$with_ogg_headers"
-	CPPFLAGS="$CPPFLAGS $ogg_cppflags"
+AC_ARG_WITH(mad_headers, [AS_HELP_STRING(--with-mad-headers=dir,
+	[look for mad.h also in dir])])
+if test -n "$with_mad_headers"; then
+	mad_cppflags="-I$with_mad_headers"
+	CPPFLAGS="$CPPFLAGS $mad_cppflags"
 fi
-if test -n "$with_ogg_libs"; then
-	ogg_libs="-L$with_ogg_libs"
-	LDFLAGS="$LDFLAGS $ogg_libs"
-fi
-AC_CHECK_HEADERS([ogg/ogg.h], [], [ have_ogg="no"; ])
-AC_CHECK_LIB([ogg], [ogg_stream_init], [], [ have_ogg="no" ])
-
-have_vorbis="yes"
-have_speex="yes"
-have_opus="yes"
-if test "$have_ogg" = "yes"; then
-	# vorbis
-	if test -n "$with_vorbis_headers"; then
-		vorbis_cppflags="-I$with_vorbis_headers"
-		CPPFLAGS="$CPPFLAGS $vorbis_cppflags"
-	fi
-	if test -n "$with_vorbis_libs"; then
-		vorbis_libs="-L$with_vorbis_libs"
-		LDFLAGS="$LDFLAGS $vorbis_libs"
-	fi
-	AC_CHECK_HEADERS([vorbis/codec.h], [], [ have_vorbis="no" ])
-	AC_CHECK_LIB([vorbis], [vorbis_info_init], [], [ have_vorbis="no" ])
-
-	# speex
-	if test -n "$with_speex_headers"; then
-		speex_cppflags="-I$with_speex_headers"
-		CPPFLAGS="$CPPFLAGS $speex_cppflags"
-	fi
-	if test -n "$with_speex_libs"; then
-		speex_libs="-L$with_speex_libs"
-		LDFLAGS="$LDFLAGS $speex_libs"
-	fi
-	AC_CHECK_LIB([speex], [speex_decoder_init], [], [ have_speex="no" ])
-	AC_CHECK_HEADERS([speex/speex.h], [], [ have_speex="no" ])
-
-	# opus
-	if test -n "$with_opus_headers"; then
-		opus_cppflags="-I$with_opus_headers"
-		CPPFLAGS="$CPPFLAGS $opus_cppflags"
-	fi
-	if test -n "$with_opus_libs"; then
-		opus_libs="-L$with_opus_libs"
-		LDFLAGS="$LDFLAGS $opus_libs"
-	fi
-	AC_CHECK_LIB([opus], [opus_multistream_decode], [], [ have_opus="no" ])
-	AC_CHECK_HEADERS([opus/opus.h], [], [ have_opus="no" ])
-else
-	AC_MSG_WARN([vorbis/speex/opus depend on libogg, which was not detected])
-	have_vorbis="no"
-	have_speex="no"
-	have_opus="no"
-fi
-
-msg="support in para_server/para_filter/para_afh"
-if test "$have_vorbis" = "yes" || \
-		test "$have_speex" = "yes" || \
-		test "$have_opus" = "yes"; then
-	AC_SUBST(ogg_cppflags)
-	ogg_ldflags="$ogg_libs -logg"
-	if test "$OSTYPE" = "Darwin"; then
-		ogg_ldflags="-Wl,-bind_at_load $ogg_ldflags"
-	fi
-	AC_SUBST(ogg_ldflags)
-	afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
-	recv_errlist_objs="$recv_errlist_objs ogg_afh_common"
-	server_errlist_objs="$server_errlist_objs ogg_afh_common"
-	play_errlist_objs="$play_errlist_objs ogg_afh_common"
-fi
-if test "$have_vorbis" = "yes"; then
-	AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg/vorbis support)
-	filters="$filters oggdec"
-	vorbis_ldflags="$vorbis_libs -lvorbis -lvorbisfile"
-	AC_SUBST(vorbis_ldflags)
-
-	server_errlist_objs="$server_errlist_objs ogg_afh"
-	filter_errlist_objs="$filter_errlist_objs oggdec_filter"
-	audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
-	play_errlist_objs="$play_errlist_objs oggdec_filter ogg_afh"
-	afh_errlist_objs="$afh_errlist_objs ogg_afh"
-	recv_errlist_objs="$recv_errlist_objs ogg_afh"
-
-	audiod_audio_formats="$audiod_audio_formats ogg"
-	audio_format_handlers="$audio_format_handlers ogg"
-fi
-if test "$have_speex" = "yes"; then
-	AC_DEFINE(HAVE_SPEEX, 1, define to 1 to turn on ogg/speex support)
-	AC_SUBST(speex_cppflags)
-	speex_ldflags="$speex_libs -lspeex"
-	AC_SUBST(speex_ldflags)
-
-	filters="$filters spxdec"
-
-	server_errlist_objs="$server_errlist_objs spx_afh spx_common"
-	filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common"
-	audiod_errlist_objs="$audiod_errlist_objs spxdec_filter spx_common"
-	play_errlist_objs="$play_errlist_objs spxdec_filter spx_afh spx_common"
-	afh_errlist_objs="$afh_errlist_objs spx_afh spx_common"
-	recv_errlist_objs="$recv_errlist_objs spx_afh spx_common"
-
-	audiod_audio_formats="$audiod_audio_formats spx"
-	audio_format_handlers="$audio_format_handlers spx"
-else
-	AC_MSG_WARN([no ogg/speex $msg])
-fi
-if test "$have_opus" = "yes"; then
-	AC_DEFINE(HAVE_OPUS, 1, define to 1 to turn on ogg/opus support)
-	AC_SUBST(opus_cppflags)
-	opus_ldflags="$opus_libs -lopus"
-	AC_SUBST(opus_ldflags)
-
-	filters="$filters opusdec"
-
-	server_errlist_objs="$server_errlist_objs opus_afh opus_common"
-	filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common"
-	audiod_errlist_objs="$audiod_errlist_objs opusdec_filter opus_common"
-	afh_errlist_objs="$afh_errlist_objs opus_afh opus_common"
-	play_errlist_objs="$play_errlist_objs opusdec_filter opus_afh opus_common"
-	recv_errlist_objs="$recv_errlist_objs opus_afh opus_common"
-
-	audiod_audio_formats="$audiod_audio_formats opus"
-	audio_format_handlers="$audio_format_handlers opus"
-else
-	AC_MSG_WARN([no ogg/opus $msg])
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
-########################################################################### faad
-have_faad=yes
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-AC_ARG_WITH(faad_headers, [AS_HELP_STRING(--with-faad-headers=dir,
-	[look for neaacdec.h also in dir])])
-if test -n "$with_faad_headers"; then
-	faad_cppflags="-I$with_faad_headers"
-	CPPFLAGS="$CPPFLAGS $faad_cppflags"
-fi
-AC_ARG_WITH(faad_libs, [AS_HELP_STRING(--with-faad-libs=dir,
-	[look for libfaad also in dir])])
-if test -n "$with_faad_libs"; then
-	faad_libs="-L$with_faad_libs"
-	LDFLAGS="$LDFLAGS $faad_libs"
-fi
-AC_CHECK_HEADER(neaacdec.h, [], have_faad=no)
-AC_CHECK_LIB([faad], [NeAACDecOpen], [], have_faad=no)
-if test "$have_faad" = "yes"; then
-	AC_DEFINE(HAVE_FAAD, 1, define to 1 if you want to build the aacdec filter)
-	AC_SUBST(faad_cppflags)
-	faad_ldflags="$faad_libs -lfaad"
-	AC_SUBST(faad_ldflags)
-
-	filter_errlist_objs="$filter_errlist_objs aacdec_filter aac_common"
-	afh_errlist_objs="$afh_errlist_objs aac_common aac_afh"
-	audiod_errlist_objs="$audiod_errlist_objs aacdec_filter aac_common"
-	play_errlist_objs="$play_errlist_objs aacdec_filter aac_afh aac_common"
-	server_errlist_objs="$server_errlist_objs aac_afh aac_common"
-	recv_errlist_objs="$recv_errlist_objs aac_afh aac_common"
-
-	audiod_audio_formats="$audiod_audio_formats aac"
-	audio_format_handlers="$audio_format_handlers aac"
-	filters="$filters aacdec"
-else
-	AC_MSG_WARN([no aac support in para_audiod/para_filter])
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
-########################################################################### mad
-have_mad="yes"
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-
-AC_ARG_WITH(mad_headers, [AS_HELP_STRING(--with-mad-headers=dir,
-	[look for mad.h also in dir])])
-if test -n "$with_mad_headers"; then
-	mad_cppflags="-I$with_mad_headers"
-	CPPFLAGS="$CPPFLAGS $mad_cppflags"
-fi
-AC_ARG_WITH(mad_libs, [AS_HELP_STRING(--with-mad-libs=dir,
-	[look for libmad also in dir])])
-if test -n "$with_mad_libs"; then
-	mad_libs="-L$with_mad_libs"
-	LDFLAGS="$LDFLAGS $mad_libs"
+AC_ARG_WITH(mad_libs, [AS_HELP_STRING(--with-mad-libs=dir,
+	[look for libmad also in dir])])
+if test -n "$with_mad_libs"; then
+	mad_libs="-L$with_mad_libs"
+	LDFLAGS="$LDFLAGS $mad_libs"
 fi
 AC_CHECK_HEADERS([mad.h], [], [
 	have_mad="no"
@@ -757,14 +354,6 @@ if test "$have_mad" = "yes"; then
 	AC_SUBST(mad_cppflags)
 	mad_ldflags="$mad_libs -lmad"
 	AC_SUBST(mad_ldflags)
-	filter_cmdline_objs="$filter_cmdline_objs mp3dec_filter"
-	audiod_cmdline_objs="$audiod_cmdline_objs mp3dec_filter"
-	play_cmdline_objs="$play_cmdline_objs mp3dec_filter"
-	filter_errlist_objs="$filter_errlist_objs mp3dec_filter"
-	audiod_errlist_objs="$audiod_errlist_objs mp3dec_filter"
-	play_errlist_objs="$play_errlist_objs mp3dec_filter"
-	audiod_audio_formats="$audiod_audio_formats mp3"
-	filters="$filters mp3dec"
 else
 	AC_MSG_WARN([no mp3dec support in para_audiod/para_filter])
 fi
@@ -825,22 +414,16 @@ if test -n "$with_flac_libs"; then
 	LDFLAGS="$LDFLAGS $flac_libs"
 fi
 AC_CHECK_HEADER(FLAC/stream_decoder.h, [], have_flac=no)
-AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [], have_flac=no, -logg -lm)
+AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [], [
+	# nope, try again with -logg
+	AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [],
+		have_flac=no, -lm -logg)
+	], -lm)
 if test "$have_flac" = "yes"; then
 	AC_DEFINE(HAVE_FLAC, 1, define to 1 if you want to build the flacdec filter)
 	AC_SUBST(flac_cppflags)
 	flac_ldflags="$flac_libs -lFLAC"
 	AC_SUBST(flac_ldflags)
-
-	filter_errlist_objs="$filter_errlist_objs flacdec_filter"
-	audiod_errlist_objs="$audiod_errlist_objs flacdec_filter"
-	play_errlist_objs="$play_errlist_objs flacdec_filter flac_afh"
-	afh_errlist_objs="$afh_errlist_objs flac_afh"
-	server_errlist_objs="$server_errlist_objs flac_afh"
-	recv_errlist_objs="$recv_errlist_objs flac_afh"
-	filters="$filters flacdec"
-	audio_format_handlers="$audio_format_handlers flac"
-	audiod_audio_formats="$audiod_audio_formats flac"
 else
 	AC_MSG_WARN([no flac support in para_audiod/para_filter/para_afh/para_server])
 fi
@@ -856,20 +439,6 @@ have_oss="yes"
 msg="=> will not build oss writer"
 
 AC_CHECK_HEADER(sys/soundcard.h, [
-	audiod_errlist_objs="$audiod_errlist_objs oss_write"
-	play_errlist_objs="$play_errlist_objs oss_write"
-	audiod_cmdline_objs="$audiod_cmdline_objs oss_write"
-	play_cmdline_objs="$play_cmdline_objs oss_write"
-
-	write_errlist_objs="$write_errlist_objs oss_write"
-	write_cmdline_objs="$write_cmdline_objs oss_write"
-	fade_errlist_objs="$fade_errlist_objs oss_mix"
-
-	writers="$writers oss"
-	default_writer="OSS_WRITE"
-	mixers="${mixers}oss "
-	default_mixer="OSS_MIX"
-
 	AC_CHECK_LIB(ossaudio, _oss_ioctl, [
 			oss_ldflags="-lossaudio"
 			AC_SUBST(oss_ldflags)
@@ -911,23 +480,8 @@ if test "$have_alsa" = "yes"; then
 fi
 
 if test "$have_alsa" = "yes"; then
-	audiod_errlist_objs="$audiod_errlist_objs alsa_write"
-	audiod_cmdline_objs="$audiod_cmdline_objs alsa_write"
-	audiod_ldflags="$audiod_ldflags -lasound"
-	play_errlist_objs="$play_errlist_objs alsa_write"
-	play_cmdline_objs="$play_cmdline_objs alsa_write"
-	play_ldflags="$play_ldflags -lasound"
-
-	write_errlist_objs="$write_errlist_objs alsa_write"
-	write_cmdline_objs="$write_cmdline_objs alsa_write"
-	write_ldflags="$write_ldflags -lasound"
-	fade_errlist_objs="$fade_errlist_objs alsa_mix"
-	fade_ldflags="$fade_ldflags -lasound"
-
-	writers="$writers alsa"
-	default_writer="ALSA_WRITE"
-	mixers="${mixers}alsa "
-	default_mixer="ALSA_MIX"
+	alsa_ldflags="-lasound"
+	AC_SUBST(alsa_ldflags)
 fi
 
 CPPFLAGS="$OLD_CPPFLAGS"
@@ -977,19 +531,9 @@ if test "$have_ao" = "yes"; then
 	])
 fi
 if test "$have_ao" = "yes"; then
-	audiod_errlist_objs="$audiod_errlist_objs ao_write"
-	audiod_cmdline_objs="$audiod_cmdline_objs ao_write"
-	audiod_ldflags="$audiod_ldflags -lao -lpthread"
-
-	play_errlist_objs="$play_errlist_objs ao_write"
-	play_cmdline_objs="$play_cmdline_objs ao_write"
-	play_ldflags="$play_ldflags -lao -lpthread"
-
-	write_errlist_objs="$write_errlist_objs ao_write"
-	write_cmdline_objs="$write_cmdline_objs ao_write"
-	write_ldflags="$write_ldflags $ao_libs -lao -lpthread"
-	writers="$writers ao"
 	AC_SUBST(ao_cppflags)
+	ao_ldflags="$ao_libs -lao -lpthread"
+	AC_SUBST(ao_ldflags)
 fi
 
 CPPFLAGS="$OLD_CPPFLAGS"
@@ -1021,22 +565,18 @@ AC_CHECK_HEADERS([readline/readline.h], [
 	AC_MSG_WARN([readline/readline.h not found, $msg])
 ])
 
-if test "$have_curses" != "yes"; then
-	have_readline="no"
-	AC_MSG_WARN([interactive cli support depends on curses,])
-	AC_MSG_WARN([but no curses lib was detected, $msg])
-fi
-
 if test "$have_readline" = "yes"; then
-	readline_libs="$readline_libs -lreadline"
-	AC_SEARCH_LIBS([rl_free_keymap], [readline], [], [have_readline="no"])
+	readline_ldflags="$readline_libs"
+	AC_SEARCH_LIBS([rl_free_keymap], [readline], [
+		readline_ldflags="$readline_ldflags -lreadline"
+	], [have_readline="no"])
 	if test "$have_readline" = "no"; then # try with -lcurses
                 # clear cache
 		AC_MSG_NOTICE([trying again with -lcurses])
                 unset ac_cv_search_rl_free_keymap 2> /dev/null
 		AC_SEARCH_LIBS([rl_free_keymap], [readline], [
 			have_readline=yes
-			readline_libs="$readline_libs -lcurses"
+			readline_ldflags="$readline_ldflags -lreadline -lcurses"
 		], [], [-lcurses])
 	fi
 	if test "$have_readline" = "no"; then # try with -ltermcap
@@ -1045,19 +585,23 @@ if test "$have_readline" = "yes"; then
                 unset ac_cv_search_rl_free_keymap 2> /dev/null
 		AC_SEARCH_LIBS([rl_free_keymap], [readline], [
 			have_readline=yes
-			readline_libs="$readline_libs -ltermcap"
+			readline_ldflags="$readline_ldflags -lreadline -ltermcap"
 		], [], [-ltermcap])
 	fi
 fi
 
 if test "$have_readline" = "yes"; then
-	client_errlist_objs="$client_errlist_objs interactive"
-	client_ldflags="$client_ldflags $readline_libs"
-	audioc_errlist_objs="$audioc_errlist_objs buffer_tree interactive sched time"
-	audioc_ldflags="$audioc_ldflags $readline_libs"
-	play_errlist_objs="$play_errlist_objs interactive"
-	play_ldflags="$play_ldflags $readline_libs"
+	AC_CHECK_DECL(
+		[rl_free_keymap],
+		[AC_DEFINE(RL_FREE_KEYMAP_DECLARED, 1, readline >= 6.3)],
+		[],
+		[
+			#include <stdio.h>
+			#include <readline/readline.h>
+		]
+	)
 	AC_SUBST(readline_cppflags)
+	AC_SUBST(readline_ldflags)
 	AC_DEFINE(HAVE_READLINE, 1, define to 1 to turn on readline support)
 else
 	AC_MSG_WARN([libreadline not found or unusable])
@@ -1088,17 +632,9 @@ AC_CHECK_HEADER(samplerate.h, [], have_samplerate=no)
 AC_CHECK_LIB([samplerate], [src_process], [], have_samplerate=no, [])
 
 if test "$have_samplerate" = "yes"; then
-	filter_errlist_objs="$filter_errlist_objs resample_filter check_wav"
-	filter_cmdline_objs="$filter_cmdline_objs resample_filter"
-	audiod_errlist_objs="$audiod_errlist_objs resample_filter check_wav"
-	audiod_cmdline_objs="$audiod_cmdline_objs resample_filter"
-	play_errlist_objs="$play_errlist_objs resample_filter check_wav"
-	play_cmdline_objs="$play_cmdline_objs resample_filter"
-	filter_ldflags="$filter_ldflags $samplerate_libs -lsamplerate"
-	audiod_ldflags="$audiod_ldflags $samplerate_libs -lsamplerate"
-	play_ldflags="$play_ldflags $samplerate_libs -lsamplerate"
-	filters="$filters resample"
 	AC_SUBST(samplerate_cppflags)
+	samplerate_ldflags="$samplerate_libs -lsamplerate"
+	AC_SUBST(samplerate_ldflags)
 else
 	AC_MSG_WARN([no resample support in para_audiod/para_filter])
 fi
@@ -1106,13 +642,11 @@ CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 ######################################################################### server
-if test \( "$have_openssl" = "yes" -o "$have_gcrypt" = "yes" \) \
-	-a "$have_osl" = "yes" ; then
-
+if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
 	build_server="yes"
 	executables="$executables server"
 	server_cmdline_objs="server"
-	server_errlist_objs="$server_errlist_objs
+	server_errlist_objs="
 		server
 		afh_common
 		mp3_afh
@@ -1151,16 +685,32 @@ if test \( "$have_openssl" = "yes" -o "$have_gcrypt" = "yes" \) \
 		version
 		ggo
 	"
-	server_ldflags="$server_ldflags $osl_libs -losl"
+	if test "$CRYPTOLIB" = openssl; then
+		server_errlist_objs="$server_errlist_objs crypt"
+	else
+		server_errlist_objs="$server_errlist_objs gcrypt"
+	fi
+	NEED_OGG_OBJECTS() && server_errlist_objs="$server_errlist_objs ogg_afh_common"
+	NEED_VORBIS_OBJECTS() && server_errlist_objs="$server_errlist_objs ogg_afh"
+	NEED_SPEEX_OBJECTS() && server_errlist_objs="$server_errlist_objs spx_afh spx_common"
+	NEED_OPUS_OBJECTS() && server_errlist_objs="$server_errlist_objs opus_afh opus_common"
+	test $HAVE_FAAD = yes && server_errlist_objs="$server_errlist_objs aac_afh aac_common"
+	if test "$have_flac" = "yes"; then
+		server_errlist_objs="$server_errlist_objs flac_afh"
+	fi
+	server_objs="add_cmdline($server_cmdline_objs) $server_errlist_objs"
+	AC_SUBST(server_objs, add_dot_o($server_objs))
+	AC_DEFINE_UNQUOTED(INIT_SERVER_ERRLISTS,
+		objlist_to_errlist($server_errlist_objs), errors used by para_server)
 else
 	build_server="no"
 fi
 ############################################################# client
-if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
+if test -n "$CRYPTOLIB"; then
 	build_client="yes"
 	executables="$executables client"
 	client_cmdline_objs="client"
-	client_errlist_objs="$client_errlist_objs
+	client_errlist_objs="
 		client
 		net
 		string
@@ -1176,13 +726,26 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
 		version
 		ggo
 	"
+	if test "$CRYPTOLIB" = openssl; then
+		client_errlist_objs="$client_errlist_objs crypt"
+	else
+		client_errlist_objs="$client_errlist_objs gcrypt"
+	fi
+	if test "$have_readline" = "yes"; then
+		client_errlist_objs="$client_errlist_objs interactive"
+	fi
+	client_objs="add_cmdline($client_cmdline_objs) $client_errlist_objs"
+	AC_SUBST(client_objs, add_dot_o($client_objs))
+	AC_DEFINE_UNQUOTED(INIT_CLIENT_ERRLISTS,
+		objlist_to_errlist($client_errlist_objs), errors used by para_client)
 else
 	build_client="no"
 fi
 ############################################################# audiod
-if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
+if test -n "$CRYPTOLIB"; then
 	build_audiod="yes"
 	executables="$executables audiod"
+	audiod_audio_formats="wma"
 	audiod_cmdline_objs="$audiod_cmdline_objs
 		audiod
 		compress_filter
@@ -1193,6 +756,7 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
 		amp_filter
 		udp_recv
 		prebuffer_filter
+		sync_filter
 	"
 	audiod_errlist_objs="$audiod_errlist_objs
 		audiod
@@ -1230,21 +794,89 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
 		wma_common
 		wmadec_filter
 		buffer_tree
+		sync_filter
 	"
-	audiod_ldflags="$audiod_ldflags -lm"
-	audiod_audio_formats="$audiod_audio_formats wma"
+	if test "$CRYPTOLIB" = openssl; then
+		audiod_errlist_objs="$audiod_errlist_objs crypt"
+	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"
+	}
+	NEED_SPEEX_OBJECTS && {
+		audiod_errlist_objs="$audiod_errlist_objs spxdec_filter spx_common"
+		audiod_audio_formats="$audiod_audio_formats spx"
+	}
+	NEED_OPUS_OBJECTS && {
+		audiod_errlist_objs="$audiod_errlist_objs opusdec_filter opus_common"
+		audiod_audio_formats="$audiod_audio_formats opus"
+	}
+	if test $HAVE_FAAD = yes; then
+		audiod_errlist_objs="$audiod_errlist_objs aacdec_filter aac_common"
+		audiod_audio_formats="$audiod_audio_formats aac"
+	fi
+	if test "$have_mad" = "yes"; then
+		audiod_audio_formats="$audiod_audio_formats mp3"
+		audiod_cmdline_objs="$audiod_cmdline_objs mp3dec_filter"
+		audiod_errlist_objs="$audiod_errlist_objs mp3dec_filter"
+	fi
+	if test "$have_flac" = "yes"; then
+		audiod_errlist_objs="$audiod_errlist_objs flacdec_filter"
+		audiod_audio_formats="$audiod_audio_formats flac"
+	fi
+	if test "$have_oss" = "yes"; then
+		audiod_errlist_objs="$audiod_errlist_objs oss_write"
+		audiod_cmdline_objs="$audiod_cmdline_objs oss_write"
+	fi
+	if test "$have_alsa" = "yes"; then
+		audiod_errlist_objs="$audiod_errlist_objs alsa_write"
+		audiod_cmdline_objs="$audiod_cmdline_objs alsa_write"
+	fi
+	if test "$have_ao" = "yes"; then
+		audiod_errlist_objs="$audiod_errlist_objs ao_write"
+		audiod_cmdline_objs="$audiod_cmdline_objs ao_write"
+	fi
+	if test "$have_samplerate" = "yes"; then
+		audiod_errlist_objs="$audiod_errlist_objs resample_filter check_wav"
+		audiod_cmdline_objs="$audiod_cmdline_objs resample_filter"
+	fi
+	audiod_objs="add_cmdline($audiod_cmdline_objs) $audiod_errlist_objs"
+	AC_SUBST(audiod_objs, add_dot_o($audiod_objs))
+	AC_DEFINE_UNQUOTED(INIT_AUDIOD_ERRLISTS, objlist_to_errlist($audiod_errlist_objs),
+		errors used by para_audiod)
+
+	enum="$(for i in $audiod_audio_formats; do printf "AUDIO_FORMAT_${i}, " | tr '[a-z]' '[A-Z]'; done)"
+	AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMATS_ENUM, $enum NUM_AUDIO_FORMATS,
+		enum of audio formats supported by audiod)
+	names="$(for i in $audiod_audio_formats; do printf \"$i\",' ' ; done)"
+	AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMAT_ARRAY, $names, array of audio formats supported by audiod)
 else
 	build_audiod="no"
 fi
 ########################################################################### fade
-if test -n "$mixers"; then
+if test "$have_oss" = "yes" -o "$have_alsa" = "yes"; then
 	build_fade="yes"
 	executables="$executables fade"
-	fade_errlist_objs="$fade_errlist_objs fade exec string fd version ggo"
 	fade_cmdline_objs="fade"
+	fade_errlist_objs="fade exec string fd version ggo"
+	if test "$have_oss" = "yes"; then
+		fade_errlist_objs="$fade_errlist_objs oss_mix"
+		mixers="${mixers}oss "
+		default_mixer="OSS_MIX"
+	fi
+	if test "$have_alsa" = "yes"; then
+		fade_errlist_objs="$fade_errlist_objs alsa_mix"
+		mixers="${mixers}alsa "
+		default_mixer="ALSA_MIX"
+	fi
 	fade_objs="add_cmdline($fade_cmdline_objs) $fade_errlist_objs"
 	AC_SUBST(fade_objs, add_dot_o($fade_objs))
-	AC_SUBST(fade_ldflags, $fade_ldflags)
 	AC_DEFINE_UNQUOTED(INIT_FADE_ERRLISTS,
 		objlist_to_errlist($fade_errlist_objs),
 		errors used by para_fade)
@@ -1268,11 +900,9 @@ if test -n "$mixers"; then
 		init functions of the supported mixers)
 	array="$(for i in $mixers; do printf '{.init = '$i'_mix_init},'; done)"
 	AC_DEFINE_UNQUOTED(MIXER_ARRAY, $array, array of supported mixers)
-	mixer_summary="supported mixers:: $mixers, default: $default_mixer"
 else
 	build_fade="no"
 	AC_MSG_WARN([no mixer support])
-	mixer_summary="para_fade: no"
 fi
 ########################################################################### gui
 if test "$have_curses" = "yes"; then
@@ -1289,14 +919,373 @@ if test "$have_curses" = "yes"; then
 		gui
 		gui_theme
 		time
+		sched
 		version
 		ggo
 	"
 	gui_objs="add_cmdline($gui_cmdline_objs) $gui_errlist_objs"
+	AC_SUBST(gui_objs, add_dot_o($gui_objs))
+	AC_DEFINE_UNQUOTED(INIT_GUI_ERRLISTS,
+		objlist_to_errlist($gui_errlist_objs), errors used by para_gui)
 else
 	build_gui="no"
 	AC_MSG_WARN([no curses lib, cannot build para_gui])
 fi
+######################################################################## filter
+filters="
+	compress
+	wav
+	amp
+	fecdec
+	wmadec
+	prebuffer
+	sync
+"
+filter_errlist_objs="
+	filter_common
+	wav_filter
+	compress_filter
+	filter
+	string
+	stdin
+	stdout
+	sched
+	fd
+	amp_filter
+	ggo
+	fecdec_filter
+	fec
+	version
+	prebuffer_filter
+	time
+	bitstream
+	imdct
+	wma_common
+	wmadec_filter
+	buffer_tree
+	net
+	sync_filter
+"
+filter_cmdline_objs="
+	filter
+	compress_filter
+	amp_filter
+	prebuffer_filter
+	sync_filter
+"
+NEED_VORBIS_OBJECTS && {
+	filters="$filters oggdec"
+	filter_errlist_objs="$filter_errlist_objs oggdec_filter"
+}
+NEED_SPEEX_OBJECTS && {
+	filters="$filters spxdec"
+	filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common"
+}
+NEED_OPUS_OBJECTS && {
+	filters="$filters opusdec"
+	filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common"
+}
+if test $HAVE_FAAD = yes; then
+	filter_errlist_objs="$filter_errlist_objs aacdec_filter aac_common"
+	filters="$filters aacdec"
+fi
+if test "$have_mad" = "yes"; then
+	filter_cmdline_objs="$filter_cmdline_objs mp3dec_filter"
+	filter_errlist_objs="$filter_errlist_objs mp3dec_filter"
+	filters="$filters mp3dec"
+fi
+if test "$have_flac" = "yes"; then
+	filter_errlist_objs="$filter_errlist_objs flacdec_filter"
+	filters="$filters flacdec"
+fi
+if test "$have_samplerate" = "yes"; then
+	filter_errlist_objs="$filter_errlist_objs resample_filter check_wav"
+	filter_cmdline_objs="$filter_cmdline_objs resample_filter"
+	filters="$filters resample"
+fi
+filters="$(echo $filters)"
+AC_SUBST(filters)
+filter_objs="add_cmdline($filter_cmdline_objs) $filter_errlist_objs"
+
+AC_SUBST(filter_objs, add_dot_o($filter_objs))
+AC_DEFINE_UNQUOTED(INIT_FILTER_ERRLISTS,
+	objlist_to_errlist($filter_errlist_objs), errors used by para_filter)
+
+enum="$(for i in $filters; do printf "${i}_FILTER, " | tr '[a-z]' '[A-Z]'; done)"
+AC_DEFINE_UNQUOTED(FILTER_ENUM, $enum NUM_SUPPORTED_FILTERS,
+	enum of supported filters)
+inits="$(for i in $filters; do printf 'extern void '$i'_filter_init(struct filter *f); '; done)"
+AC_DEFINE_UNQUOTED(DECLARE_FILTER_INITS, $inits, init functions of the supported filters)
+array="$(for i in $filters; do printf '{.name = "'$i'", .init = '$i'_filter_init},'; done)"
+AC_DEFINE_UNQUOTED(FILTER_ARRAY, $array, array of supported filters)
+########################################################################## recv
+recv_cmdline_objs="
+	recv
+	http_recv
+	dccp_recv
+	udp_recv
+	afh_recv
+"
+
+recv_errlist_objs="
+	http_recv
+	recv_common
+	recv
+	time
+	string
+	net
+	dccp_recv
+	fd
+	sched
+	stdout
+	ggo
+	udp_recv
+	buffer_tree
+	afh_recv
+	afh_common
+	wma_afh
+	wma_common
+	mp3_afh
+	version
+"
+NEED_OGG_OBJECTS && recv_errlist_objs="$recv_errlist_objs ogg_afh_common"
+NEED_VORBIS_OBJECTS && recv_errlist_objs="$recv_errlist_objs ogg_afh"
+NEED_SPEEX_OBJECTS && recv_errlist_objs="$recv_errlist_objs spx_afh spx_common"
+NEED_OPUS_OBJECTS && recv_errlist_objs="$recv_errlist_objs opus_afh opus_common"
+
+if test $HAVE_FAAD = yes; then
+	recv_errlist_objs="$recv_errlist_objs aac_afh aac_common"
+fi
+if test "$have_flac" = "yes"; then
+	recv_errlist_objs="$recv_errlist_objs flac_afh"
+fi
+recv_objs="add_cmdline($recv_cmdline_objs) $recv_errlist_objs"
+AC_SUBST(receivers, "http dccp udp afh")
+AC_SUBST(recv_objs, add_dot_o($recv_objs))
+AC_DEFINE_UNQUOTED(INIT_RECV_ERRLISTS, objlist_to_errlist($recv_errlist_objs),
+	errors used by para_recv)
+########################################################################### afh
+audio_format_handlers="mp3 wma"
+afh_cmdline_objs="afh"
+afh_errlist_objs="
+	afh
+	string
+	fd
+	mp3_afh
+	afh_common
+	time
+	wma_afh
+	wma_common
+	version
+	ggo
+"
+NEED_OGG_OBJECTS && afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
+NEED_VORBIS_OBJECTS && {
+	afh_errlist_objs="$afh_errlist_objs ogg_afh"
+	audio_format_handlers="$audio_format_handlers ogg"
+}
+NEED_SPEEX_OBJECTS && {
+	afh_errlist_objs="$afh_errlist_objs spx_afh spx_common"
+	audio_format_handlers="$audio_format_handlers spx"
+}
+NEED_OPUS_OBJECTS && {
+	afh_errlist_objs="$afh_errlist_objs opus_afh opus_common"
+	audio_format_handlers="$audio_format_handlers opus"
+}
+if test $HAVE_FAAD = yes; then
+	afh_errlist_objs="$afh_errlist_objs aac_common aac_afh"
+	audio_format_handlers="$audio_format_handlers aac"
+fi
+if test "$have_flac" = "yes"; then
+	afh_errlist_objs="$afh_errlist_objs flac_afh"
+	audio_format_handlers="$audio_format_handlers flac"
+fi
+
+afh_objs="add_cmdline($afh_cmdline_objs) $afh_errlist_objs"
+
+AC_SUBST(afh_objs, add_dot_o($afh_objs))
+AC_DEFINE_UNQUOTED(INIT_AFH_ERRLISTS,
+	objlist_to_errlist($afh_errlist_objs), errors used by para_afh)
+########################################################################## play
+play_errlist_objs="
+	play
+	fd
+	sched
+	ggo
+	buffer_tree
+	time
+	string
+	net
+	afh_recv
+	afh_common
+	wma_afh
+	wma_common
+	mp3_afh
+	recv_common
+	udp_recv
+	http_recv
+	dccp_recv
+	filter_common
+	fec
+	bitstream
+	imdct
+	wav_filter
+	compress_filter
+	amp_filter
+	prebuffer_filter
+	fecdec_filter
+	wmadec_filter
+	write_common
+	file_write
+	version
+	sync_filter
+"
+play_cmdline_objs="
+	http_recv
+	dccp_recv
+	udp_recv
+	afh_recv
+	compress_filter
+	amp_filter
+	prebuffer_filter
+	file_write
+	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"
+}
+NEED_SPEEX_OBJECTS && {
+	play_errlist_objs="$play_errlist_objs spxdec_filter spx_afh spx_common"
+}
+NEED_OPUS_OBJECTS &&
+	play_errlist_objs="$play_errlist_objs
+		opusdec_filter
+		opus_afh
+		opus_common
+	"
+if test $HAVE_FAAD = yes; then
+	play_errlist_objs="$play_errlist_objs aacdec_filter aac_afh aac_common"
+fi
+if test "$have_mad" = "yes"; then
+	play_cmdline_objs="$play_cmdline_objs mp3dec_filter"
+	play_errlist_objs="$play_errlist_objs mp3dec_filter"
+fi
+if test "$have_flac" = "yes"; then
+	play_errlist_objs="$play_errlist_objs flacdec_filter flac_afh"
+fi
+if test "$have_oss" = "yes"; then
+	play_errlist_objs="$play_errlist_objs oss_write"
+	play_cmdline_objs="$play_cmdline_objs oss_write"
+fi
+if test "$have_alsa" = "yes"; then
+	play_errlist_objs="$play_errlist_objs alsa_write"
+	play_cmdline_objs="$play_cmdline_objs alsa_write"
+fi
+if test "$have_ao" = "yes"; then
+	play_errlist_objs="$play_errlist_objs ao_write"
+	play_cmdline_objs="$play_cmdline_objs ao_write"
+fi
+if test "$have_readline" = "yes"; then
+	play_errlist_objs="$play_errlist_objs interactive"
+fi
+if test "$have_samplerate" = "yes"; then
+	play_errlist_objs="$play_errlist_objs resample_filter check_wav"
+	play_cmdline_objs="$play_cmdline_objs resample_filter"
+fi
+
+play_objs="add_cmdline($play_cmdline_objs) $play_errlist_objs"
+AC_SUBST(play_objs, add_dot_o($play_objs))
+AC_DEFINE_UNQUOTED(INIT_PLAY_ERRLISTS,
+	objlist_to_errlist($play_errlist_objs), errors used by para_play)
+######################################################################### write
+write_cmdline_objs="
+	write
+	file_write
+"
+write_errlist_objs="
+	write
+	write_common
+	file_write
+	time
+	fd
+	string
+	sched
+	stdin
+	buffer_tree
+	ggo
+	check_wav
+	version
+"
+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
+if test "$have_ao" = "yes"; then
+	write_errlist_objs="$write_errlist_objs ao_write"
+	write_cmdline_objs="$write_cmdline_objs ao_write"
+	writers="$writers ao"
+	default_writer="AO_WRITE"
+fi
+if test "$have_oss" = "yes"; then
+	write_errlist_objs="$write_errlist_objs oss_write"
+	write_cmdline_objs="$write_cmdline_objs oss_write"
+	writers="$writers oss"
+	default_writer="OSS_WRITE"
+fi
+if test "$have_alsa" = "yes"; then
+	write_errlist_objs="$write_errlist_objs alsa_write"
+	write_cmdline_objs="$write_cmdline_objs alsa_write"
+	writers="$writers alsa"
+	default_writer="ALSA_WRITE"
+fi
+AC_SUBST(writers)
+write_objs="add_cmdline($write_cmdline_objs) $write_errlist_objs"
+AC_SUBST(write_objs, add_dot_o($write_objs))
+AC_DEFINE_UNQUOTED(INIT_WRITE_ERRLISTS,
+	objlist_to_errlist($write_errlist_objs), errors used by para_write)
+enum="$(for i in $writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"
+AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
+	enum of supported writers)
+AC_DEFINE_UNQUOTED(DEFAULT_WRITER, $default_writer, use this writer if none was specified)
+names="$(for i in $writers; do printf \"$i\",' ' ; done)"
+AC_DEFINE_UNQUOTED(WRITER_NAMES, $names, supported writer names)
+inits="$(for i in $writers; do printf 'extern void '$i'_write_init(struct writer *); '; done)"
+AC_DEFINE_UNQUOTED(DECLARE_WRITER_INITS, $inits, init functions of the supported writers)
+array="$(for i in $writers; do printf '{.init = '$i'_write_init},'; done)"
+AC_DEFINE_UNQUOTED(WRITER_ARRAY, $array, array of supported writers)
+######################################################################## audioc
+audioc_cmdline_objs="audioc"
+audioc_errlist_objs="
+	audioc
+	string
+	net
+	fd
+	version
+	ggo
+"
+if test "$have_readline" = "yes"; then
+	audioc_errlist_objs="$audioc_errlist_objs
+		buffer_tree
+		interactive
+		sched
+		time
+	"
+fi
+audioc_objs="add_cmdline($audioc_cmdline_objs) $audioc_errlist_objs"
+AC_SUBST(audioc_objs, add_dot_o($audioc_objs))
+AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS,
+	objlist_to_errlist($audioc_errlist_objs), errors used by para_audioc)
 ############################################################# error2.h
 # these are always built
 all_errlist_objs="
@@ -1335,9 +1324,8 @@ done
 # use echo to replace newlines by space
 AC_SUBST(object_executable_matrix, $(echo $object_executable_matrix))
 
-for obj in $all_errlist_objs; do
-	SS="$SS SS_$(echo $obj | tr 'a-z' 'A-Z'),"
-done
+SS=$(for obj in $all_errlist_objs; do
+	printf '%s' " SS_$obj,"; done | tr 'a-z' 'A-Z')
 AC_DEFINE_UNQUOTED(DEFINE_ERRLIST_OBJECT_ENUM,
 	[enum {$SS NUM_SS}],
 	[list of all objects that use the paraslash error facility]
@@ -1371,103 +1359,19 @@ AC_DEFINE_UNQUOTED(AUDIO_FORMAT_HANDLERS, "$audio_format_handlers",
 
 AC_SUBST(executables)
 
-recv_objs="add_cmdline($recv_cmdline_objs) $recv_errlist_objs"
-filter_objs="add_cmdline($filter_cmdline_objs) $filter_errlist_objs"
-audiod_objs="add_cmdline($audiod_cmdline_objs) $audiod_errlist_objs"
-server_objs="add_cmdline($server_cmdline_objs) $server_errlist_objs"
-write_objs="add_cmdline($write_cmdline_objs) $write_errlist_objs"
-client_objs="add_cmdline($client_cmdline_objs) $client_errlist_objs"
-audioc_objs="add_cmdline($audioc_cmdline_objs) $audioc_errlist_objs"
-afh_objs="add_cmdline($afh_cmdline_objs) $afh_errlist_objs"
-play_objs="add_cmdline($play_cmdline_objs) $play_errlist_objs"
-gui_objs="add_cmdline($gui_cmdline_objs) $gui_errlist_objs"
-
-AC_SUBST(recv_objs, add_dot_o($recv_objs))
-AC_SUBST(recv_ldflags, $recv_ldflags)
-AC_DEFINE_UNQUOTED(INIT_RECV_ERRLISTS, objlist_to_errlist($recv_errlist_objs),
-	errors used by para_recv)
-
-AC_SUBST(filter_objs, add_dot_o($filter_objs))
-AC_SUBST(filter_ldflags, $filter_ldflags)
-AC_DEFINE_UNQUOTED(INIT_FILTER_ERRLISTS,
-	objlist_to_errlist($filter_errlist_objs), errors used by para_filter)
-
-AC_SUBST(audiod_objs, add_dot_o($audiod_objs))
-AC_SUBST(audiod_ldflags, $audiod_ldflags)
-AC_DEFINE_UNQUOTED(INIT_AUDIOD_ERRLISTS, objlist_to_errlist($audiod_errlist_objs),
-	errors used by para_audiod)
-
-AC_SUBST(server_objs, add_dot_o($server_objs))
-AC_SUBST(server_ldflags, $server_ldflags)
-AC_DEFINE_UNQUOTED(INIT_SERVER_ERRLISTS,
-	objlist_to_errlist($server_errlist_objs), errors used by para_server)
-
-AC_SUBST(afh_objs, add_dot_o($afh_objs))
-AC_SUBST(afh_ldflags, $afh_ldflags)
-AC_DEFINE_UNQUOTED(INIT_AFH_ERRLISTS,
-	objlist_to_errlist($afh_errlist_objs), errors used by para_afh)
-
-AC_SUBST(write_objs, add_dot_o($write_objs))
-AC_SUBST(write_ldflags, $write_ldflags)
-AC_DEFINE_UNQUOTED(INIT_WRITE_ERRLISTS,
-	objlist_to_errlist($write_errlist_objs), errors used by para_write)
-
-AC_SUBST(client_objs, add_dot_o($client_objs))
-AC_SUBST(client_ldflags, $client_ldflags)
-AC_DEFINE_UNQUOTED(INIT_CLIENT_ERRLISTS,
-	objlist_to_errlist($client_errlist_objs), errors used by para_client)
-
-AC_SUBST(audioc_objs, add_dot_o($audioc_objs))
-AC_SUBST(audioc_ldflags, $audioc_ldflags)
-AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS,
-	objlist_to_errlist($audioc_errlist_objs), errors used by para_audioc)
-
-AC_SUBST(gui_objs, add_dot_o($gui_objs))
-AC_DEFINE_UNQUOTED(INIT_GUI_ERRLISTS,
-	objlist_to_errlist($gui_errlist_objs), errors used by para_gui)
-
-AC_SUBST(play_objs, add_dot_o($play_objs))
-AC_SUBST(play_ldflags, $play_ldflags)
-AC_DEFINE_UNQUOTED(INIT_PLAY_ERRLISTS,
-	objlist_to_errlist($play_errlist_objs), errors used by para_play)
-
-enum="$(for i in $filters; do printf "${i}_FILTER, " | tr '[a-z]' '[A-Z]'; done)"
-AC_DEFINE_UNQUOTED(FILTER_ENUM, $enum NUM_SUPPORTED_FILTERS,
-	enum of supported filters)
-inits="$(for i in $filters; do printf 'extern void '$i'_filter_init(struct filter *f); '; done)"
-AC_DEFINE_UNQUOTED(DECLARE_FILTER_INITS, $inits, init functions of the supported filters)
-array="$(for i in $filters; do printf '{.name = "'$i'", .init = '$i'_filter_init},'; done)"
-AC_DEFINE_UNQUOTED(FILTER_ARRAY, $array, array of supported filters)
-
-enum="$(for i in $writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"
-AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
-	enum of supported writers)
-AC_DEFINE_UNQUOTED(DEFAULT_WRITER, $default_writer, use this writer if none was specified)
-names="$(for i in $writers; do printf \"$i\",' ' ; done)"
-AC_DEFINE_UNQUOTED(WRITER_NAMES, $names, supported writer names)
-inits="$(for i in $writers; do printf 'extern void '$i'_write_init(struct writer *); '; done)"
-AC_DEFINE_UNQUOTED(DECLARE_WRITER_INITS, $inits, init functions of the supported writers)
-array="$(for i in $writers; do printf '{.init = '$i'_write_init},'; done)"
-AC_DEFINE_UNQUOTED(WRITER_ARRAY, $array, array of supported writers)
-
-enum="$(for i in $audiod_audio_formats; do printf "AUDIO_FORMAT_${i}, " | tr '[a-z]' '[A-Z]'; done)"
-AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMATS_ENUM, $enum NUM_AUDIO_FORMATS,
-	enum of audio formats supported by audiod)
-names="$(for i in $audiod_audio_formats; do printf \"$i\",' ' ; done)"
-AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMAT_ARRAY, $names, array of audio formats supported by audiod)
-
 AC_OUTPUT
 AC_MSG_NOTICE([
 paraslash configuration:
 ~~~~~~~~~~~~~~~~~~~~~~~~
+crypto lib: ${CRYPTOLIB:-[none]}
 unix socket credentials: $have_ucred
 readline (interactive CLIs): $have_readline
 audio formats handlers: $audio_format_handlers
 id3 version2 support: $have_libid3tag
-filters: $(echo $filters)
+filters: $filters
 writers: $writers
 
-$mixer_summary
+para_fade: $build_fade
 para_server: $build_server
 para_gui: $build_gui
 para_fade: $build_fade