X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=d700323f487250ed86c14117409656c08beb3f9d;hp=0a0fbf974ca50edcfb549cabeffbbfb6f09a5f7e;hb=35074cc1a527fd6a275101ba561c65cc13a0fa41;hpb=a320e1b5f7aa8af11dbc82f40525e40bc18454c9

diff --git a/configure.ac b/configure.ac
index 0a0fbf97..d700323f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,3 @@
-#                                               -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-
 AC_PREREQ([2.61])
 
 AC_INIT([paraslash], [m4_esyscmd_s(./GIT-VERSION-GEN)],
@@ -10,20 +7,6 @@ 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([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])])
@@ -53,7 +36,7 @@ AC_DEFUN([UNSTASH_FLAGS], [
 	LIBS="$OLD_LIBS"
 ])
 AC_DEFUN([LIB_SUBST_FLAGS], [
-	if test "$HAVE_[]m4_toupper([$1])" == 'yes'; then
+	if test "$HAVE_[]m4_toupper([$1])" = 'yes'; then
 		AC_DEFINE(HAVE_[]m4_toupper([$1]), 1,
 			define to 1 to turn on $1 support)
 	else
@@ -65,34 +48,29 @@ AC_DEFUN([LIB_SUBST_FLAGS], [
 	AC_SUBST($1_ldflags)
 ])
 
-AC_PATH_PROG(UNAMEPATH, uname, no)
-if test "$UNAMEPATH" = "no"; then
-	AC_MSG_ERROR(unable to determine system type)
-fi
-AC_MSG_CHECKING(os type)
-OSTYPE="`$UNAMEPATH -s`"
-AC_MSG_RESULT("$OSTYPE")
-
-if test "$OSTYPE" = "SunOS"; then
-	# needed on SunOS for socket magic
-	arch_cppflags="-D_XOPEN_SOURCE=500 -D__EXTENSIONS__"
-	AC_SUBST(arch_cppflags)
-fi
-
+AC_USE_SYSTEM_EXTENSIONS
 AC_C_BIGENDIAN()
 
-AC_PATH_PROG([gengetopt], [gengetopt])
-test -z "$gengetopt" && AC_MSG_ERROR(
+AC_PATH_PROG([GENGETOPT], [gengetopt])
+test -z "$GENGETOPT" && AC_MSG_ERROR(
 	[gengetopt is required to build this package])
 
-AC_PATH_PROG([help2man], [help2man])
-test -z "$help2man" && AC_MSG_ERROR(
+AC_PATH_PROG([M4], [m4])
+test -z "$M4" && AC_MSG_ERROR(
+	[The m4 macro processor is required to build this package])
+
+AC_PATH_PROG([HELP2MAN], [help2man])
+test -z "$HELP2MAN" && AC_MSG_ERROR(
 	[help2man is required to build this package])
 
-AC_PATH_PROG([install], [install])
-test -z "$install" && AC_MSG_ERROR(
+AC_PATH_PROG([INSTALL], [install])
+test -z "$INSTALL" && AC_MSG_ERROR(
 	[The install program is required to build this package])
 
+AC_PATH_PROG([lopsubgen], [lopsubgen])
+test -z "$lopsubgen" && AC_MSG_ERROR(
+	[lopsubgen is required to build this package])
+
 AC_PROG_CC
 AC_PROG_CPP
 
@@ -118,7 +96,43 @@ AC_CHECK_HEADER(osl.h, [], [HAVE_OSL=no])
 AC_CHECK_LIB([osl], [osl_open_table], [], [HAVE_OSL=no])
 LIB_SUBST_FLAGS(osl)
 UNSTASH_FLAGS
-########################################################################### crypto
+######################################################################## lopsub
+STASH_FLAGS
+LIB_ARG_WITH([lopsub], [-llopsub])
+HAVE_LOPSUB=yes
+AC_CHECK_HEADER(lopsub.h, [], [HAVE_LOPSUB=no])
+AC_CHECK_LIB([lopsub], [lls_merge], [], [HAVE_LOPSUB=yes])
+if test $HAVE_LOPSUB = no; then AC_MSG_ERROR([
+	The lopsub library is required to build this software, but
+	the above checks indicate it is not installed on your system.
+	Run the following command to download a copy.
+		git clone git://git.tuebingen.mpg.de/lopsub.git
+	Install the library, then run this configure script again.
+])
+fi
+LIB_SUBST_FLAGS([lopsub])
+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)
+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
+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"
@@ -126,112 +140,59 @@ 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]);;
+"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
+	if test $HAVE_OPENSSL = yes; then
+		CRYPTOLIB=openssl
+		crypto_ldflags="$openssl_ldflags"
+	fi
+	;;
+*)
+	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_ldflags="$openssl_libs -lssl -lcrypto"
-		AC_SUBST(openssl_ldflags)
-
-		check_gcrypt="no"
-	else
-		AC_MSG_WARN([openssl libraries not found])
-	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"
-	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_ldflags="$gcrypt_libs -lgcrypt"
-		AC_SUBST(gcrypt_ldflags)
-	else
-		AC_MSG_WARN([gcrypt library not found])
-	fi
-	CPPFLAGS="$OLD_CPPFLAGS"
-	LDFLAGS="$OLD_LDFLAGS"
-	LIBS="$OLD_LIBS"
-else
-	have_gcrypt="no"
-fi
-########################################################################### libsocket
-AC_CHECK_LIB([c], [socket],
-	[socket_ldlflags=],
-	[socket_ldflags="-lsocket"]
+AC_SUBST(crypto_ldflags)
+########################################################################## iconv
+STASH_FLAGS
+LIBS=
+AC_SEARCH_LIBS([libiconv_open], [iconv],
+	[iconv_ldflags="$LIBS"],
+	[]
 )
-AC_SUBST(socket_ldflags)
-########################################################################### libnsl
-AC_CHECK_LIB([c], [gethostbyname],
-	[nsl_ldflags=],
-	[nsl_ldflags="-lnsl"]
+AC_SUBST(iconv_ldflags)
+AC_MSG_CHECKING([whether iconv needs const char ** cast])
+AC_COMPILE_IFELSE([
+        AC_LANG_PROGRAM([
+                #include <iconv.h>
+        ],[
+                size_t iconv(iconv_t cd, const char **inbuf,
+                        size_t *inbytesleft, char **outbuf,
+                        size_t *outbytesleft);
+        ])
+],
+        [cast='(const char **)'; msg=yes],
+        [cast=; msg=no]
 )
-AC_SUBST(nsl_ldflags)
+AC_DEFINE_UNQUOTED(ICONV_CAST, $cast, [cast for second arg to iconv()])
+AC_MSG_RESULT($msg)
+UNSTASH_FLAGS
 ########################################################################### ucred
 AC_MSG_CHECKING(for struct ucred)
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-	#define _GNU_SOURCE
 	#include <sys/types.h>
 	#include <sys/socket.h>
 ]], [[
@@ -242,7 +203,7 @@ if test ${have_ucred} = yes; then
 	AC_DEFINE(HAVE_UCRED, 1, define to 1 you have struct ucred)
 fi
 ########################################################################### gengetopt
-echo 'option "z" z "" flag off' | $gengetopt --file-name conftest-ggo &&
+echo 'option "z" z "" flag off' | $GENGETOPT --file-name conftest-ggo &&
 AC_CHECK_DECL(
 	[gengetopt_args_info_description],
 	[ggo_descriptions_declared=yes],
@@ -251,39 +212,14 @@ AC_CHECK_DECL(
 )
 AC_SUBST(ggo_descriptions_declared)
 ########################################################################### curses
-have_curses="yes"
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-AC_ARG_WITH(curses_headers, [AS_HELP_STRING(--with-curses-headers=dir,
-	[look for curses.h also in dir])])
-if test -n "$with_curses_headers"; then
-	curses_cppflags="-I$with_curses_headers"
-	CPPFLAGS="$CPPFLAGS $curses_cppflags"
-fi
-AC_ARG_WITH(curses_libs, [AS_HELP_STRING(--with-curses-libs=dir,
-	[look for libcurses also in dir])])
-if test -n "$with_curses_libs"; then
-	curses_libs="-L$with_curses_libs"
-	LDFLAGS="$LDFLAGS $curses_libs"
-fi
-AC_CHECK_HEADER(curses.h, [], [
-	have_curses="no"
-])
-curses_ldflags="$curses_libs"
-AC_CHECK_LIB([ncursesw], [initscr],
-	[curses_ldflags="$curses_libs -lncursesw"], [
-		AC_CHECK_LIB([curses], [initscr],
-			[curses_ldflags="$curses_libs -lcurses"],
-			[have_curses="no"]
-		)
-	]
-)
-AC_SUBST(curses_cppflags)
-AC_SUBST(curses_ldflags)
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
+STASH_FLAGS
+LIB_ARG_WITH([curses], [])
+HAVE_CURSES=yes
+AC_CHECK_HEADER(curses.h, [], [HAVE_CURSES=no])
+AC_SEARCH_LIBS([initscr], [ncursesw curses], [], [HAVE_CURSES=no])
+curses_ldflags="$curses_ldflags $LIBS"
+LIB_SUBST_FLAGS(curses)
+UNSTASH_FLAGS
 ########################################################################### ip_mreqn
 AC_MSG_CHECKING(for struct ip_mreqn (UDPv4 multicast))
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
@@ -321,6 +257,8 @@ 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])
+AC_CHECK_LIB([ogg], [ogg_stream_flush_fill], [
+	AC_DEFINE(HAVE_OGG_STREAM_FLUSH_FILL, 1, [libogg >= 1.3.0])])
 LIB_SUBST_FLAGS(ogg)
 UNSTASH_FLAGS
 ######################################################################### vorbis
@@ -339,11 +277,30 @@ 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
+########################################################################### flac
+STASH_FLAGS
+LIB_ARG_WITH([flac], [-lFLAC -lm])
+HAVE_FLAC=yes
+AC_CHECK_HEADER(FLAC/stream_decoder.h, [], HAVE_FLAC=no)
+AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [], HAVE_FLAC=no)
+LIB_SUBST_FLAGS(flac)
+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' \
+		-o "$HAVE_FLAC" = 'yes' \
 	\)
 }])
 AC_DEFUN([NEED_VORBIS_OBJECTS], [{
@@ -352,394 +309,104 @@ AC_DEFUN([NEED_VORBIS_OBJECTS], [{
 AC_DEFUN([NEED_SPEEX_OBJECTS], [{
 	test "$HAVE_OGG" = 'yes' -a "$HAVE_SPEEX" = 'yes'
 }])
-####################################################### ogg/vorbis/speex/opus
-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])])
-
-have_opus="yes"
-if test "$HAVE_OGG" = 'yes'; then
-
-	# opus
-	OLD_CPPFLAGS="$CPPFLAGS"
-	OLD_LDFLAGS="$LDFLAGS"
-	OLD_LIBS="$LIBS"
-	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" ])
-	CPPFLAGS="$OLD_CPPFLAGS"
-	LDFLAGS="$OLD_LDFLAGS"
-	LIBS="$OLD_LIBS"
-else
-	AC_MSG_WARN([vorbis/speex/opus depend on libogg, which was not detected])
-	have_opus="no"
-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)
-	audio_format_handlers="$audio_format_handlers opus"
-else
-	AC_MSG_WARN([no ogg/opus $msg])
-fi
+AC_DEFUN([NEED_OPUS_OBJECTS], [{
+	test "$HAVE_OGG" = 'yes' -a "$HAVE_OPUS" = 'yes'
+}])
+AC_DEFUN([NEED_FLAC_OBJECTS], [{
+	test "$HAVE_OGG" = 'yes' -a "$HAVE_FLAC" = 'yes'
+}])
 ########################################################################### 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)
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
+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(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"
-fi
-AC_CHECK_HEADERS([mad.h], [], [
-	have_mad="no"
-])
-AC_CHECK_LIB([mad], [mad_stream_init], [], [
-	have_mad="no"
-])
-if test "$have_mad" = "yes"; then
-	AC_DEFINE(HAVE_MAD, 1, define to 1 if you want to build the mp3dec filter)
-	AC_SUBST(mad_cppflags)
-	mad_ldflags="$mad_libs -lmad"
-	AC_SUBST(mad_ldflags)
-else
-	AC_MSG_WARN([no mp3dec support in para_audiod/para_filter])
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
+STASH_FLAGS
+LIB_ARG_WITH([mad], [-lmad])
+HAVE_MAD=yes
+AC_CHECK_HEADER(mad.h, [], HAVE_MAD=no)
+AC_CHECK_LIB([mad], [mad_stream_init], [], HAVE_MAD=no)
+LIB_SUBST_FLAGS(mad)
+UNSTASH_FLAGS
 ###################################################################### libid3tag
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-
-have_libid3tag="yes"
-AC_ARG_WITH(id3tag_headers, [AS_HELP_STRING(--with-id3tag-headers=dir,
-	[look for id3tag header files also in dir])])
-if test -n "$with_id3tag_headers"; then
-	id3tag_cppflags="-I$with_id3tag_headers"
-	CPPFLAGS="$CPPFLAGS $id3tag_cppflags"
-fi
-AC_ARG_WITH(id3tag_libs, [AS_HELP_STRING(--with-id3tag-libs=dir,
-	[look for id3tag libs also in dir])])
-if test -n "$with_id3tag_libs"; then
-	id3tag_libs="-L$with_id3tag_libs"
-	LDFLAGS="$LDFLAGS $id3tag_libs"
-fi
-
-AC_MSG_CHECKING(for libid3tag)
-AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-	#include <id3tag.h>
-]], [[
-	struct id3_tag t = {.flags = 0};
-]])],[],[have_libid3tag=no])
-AC_MSG_RESULT($have_libid3tag)
-
-if test ${have_libid3tag} = yes; then
-	AC_DEFINE(HAVE_LIBID3TAG, 1, define to 1 you have libid3tag)
-	AC_SUBST(id3tag_cppflags)
-	AC_SUBST(id3tag_ldflags, "$id3tag_libs -lid3tag -lz")
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
-########################################################################### flac
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-
-have_flac="yes"
-AC_ARG_WITH(flac_headers, [AS_HELP_STRING(--with-flac-headers=dir,
-	[look for flac headers also in dir])])
-if test -n "$with_flac_headers"; then
-	flac_cppflags="-I$with_flac_headers"
-	CPPFLAGS="$CPPFLAGS $flac_cppflags"
-fi
-AC_ARG_WITH(flac_libs, [AS_HELP_STRING(--with-flac-libs=dir,
-	[look for flac libs also in dir])])
-if test -n "$with_flac_libs"; then
-	flac_libs="-L$with_flac_libs"
-	LDFLAGS="$LDFLAGS $flac_libs"
-fi
-AC_CHECK_HEADER(FLAC/stream_decoder.h, [], have_flac=no)
-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)
-else
-	AC_MSG_WARN([no flac support in para_audiod/para_filter/para_afh/para_server])
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
+STASH_FLAGS
+LIB_ARG_WITH([id3tag], [-lid3tag -lz])
+HAVE_ID3TAG=yes
+AC_CHECK_HEADER(id3tag.h, [], HAVE_ID3TAG=no)
+AC_CHECK_LIB([id3tag], [id3_file_fdopen], [], HAVE_ID3TAG=no)
+LIB_SUBST_FLAGS(id3tag)
+UNSTASH_FLAGS
 ########################################################################### oss
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-
-have_oss="yes"
-msg="=> will not build oss writer"
-
-AC_CHECK_HEADER(sys/soundcard.h, [
-	AC_CHECK_LIB(ossaudio, _oss_ioctl, [
-			oss_ldflags="-lossaudio"
-			AC_SUBST(oss_ldflags)
-		]
-	)
-	],
+STASH_FLAGS
+LIB_ARG_WITH([oss], [])
+AC_CHECK_HEADER(sys/soundcard.h, [HAVE_OSS=yes], [HAVE_OSS=no])
+AC_CHECK_LIB(ossaudio, _oss_ioctl, [oss_ldflags="$oss_ldflags -lossaudio"], [])
+LIB_SUBST_FLAGS(oss)
+UNSTASH_FLAGS
+########################################################################### alsa
+STASH_FLAGS
+LIB_ARG_WITH([alsa], [-lasound])
+HAVE_ALSA=yes
+AC_CHECK_HEADER(alsa/asoundlib.h, [], HAVE_ALSA=no)
+AC_CHECK_LIB([asound], [snd_pcm_open], [], HAVE_ALSA=no)
+LIB_SUBST_FLAGS(alsa)
+UNSTASH_FLAGS
+######################################################################### pthread
+STASH_FLAGS
+LIB_ARG_WITH([pthread], [-lpthread])
+HAVE_PTHREAD=yes
+AC_CHECK_HEADER(pthread.h, [], HAVE_PTHREAD=no)
+AC_CHECK_LIB([pthread], [pthread_create], [], HAVE_PTHREAD=no)
+LIB_SUBST_FLAGS(pthread)
+UNSTASH_FLAGS
+########################################################################### libao
+STASH_FLAGS
+LIB_ARG_WITH([ao], [-lao])
+HAVE_AO=yes
+AC_CHECK_HEADER(ao/ao.h, [], HAVE_AO=no)
+AC_CHECK_LIB([ao], [ao_initialize], [], HAVE_AO=no)
+LIB_SUBST_FLAGS(ao)
+UNSTASH_FLAGS
+AC_DEFUN([NEED_AO_OBJECTS], [{ test $HAVE_AO = yes -a $HAVE_PTHREAD = yes; }])
+######################################################################## readline
+STASH_FLAGS
+AC_SEARCH_LIBS([tgetent], [tinfo curses terminfo termcap])
+LIB_ARG_WITH([readline], [-lreadline $LIBS])
+HAVE_READLINE=yes
+AC_CHECK_HEADER([readline/readline.h], [], [HAVE_READLINE=no])
+AC_CHECK_LIB([readline], [rl_free_keymap], [], HAVE_READLINE=no)
+AC_CHECK_DECL(
+	[rl_free_keymap],
+	[AC_DEFINE(RL_FREE_KEYMAP_DECLARED, 1, readline >= 6.3)],
+	[],
 	[
-		have_oss="no"
-		AC_MSG_WARN([no sys/soundcard.h $msg])
+		#include <stdio.h>
+		#include <readline/readline.h>
 	]
 )
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
-
-########################################################################### alsa
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-
-msg="=> no alsa support for para_audiod/para_write"
-if test "$OSTYPE" != "Linux"; then
-	have_alsa="no"
-else
-	have_alsa="yes"
-fi
-if test "$have_alsa" = "yes"; then
-	AC_CHECK_HEADERS([alsa/asoundlib.h], [], [
-		have_alsa="no"
-		AC_MSG_WARN([no alsa/asoundlib $msg])
-	])
-fi
-
-if test "$have_alsa" = "yes"; then
-	AC_CHECK_LIB([asound], [snd_pcm_open], [], [
-		have_alsa="no"
-		AC_MSG_WARN([no libasound $msg])
-	])
-fi
-
-if test "$have_alsa" = "yes"; then
-	alsa_ldflags="-lasound"
-	AC_SUBST(alsa_ldflags)
-fi
-
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
-########################################################################### libao
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-
-have_ao="yes"
-AC_ARG_WITH(ao_headers, [AS_HELP_STRING(--with-ao-headers=dir,
-	[look for ao/ao.h also in dir])])
-if test -n "$with_ao_headers"; then
-	ao_cppflags="-I$with_ao_headers"
-	CPPFLAGS="$CPPFLAGS $ao_cppflags"
-fi
-AC_ARG_WITH(ao_libs, [AS_HELP_STRING(--with-ao-libs=dir,
-	[look for libao also in dir])])
-if test -n "$with_ao_libs"; then
-	ao_libs="-L$with_ao_libs"
-	LDFLAGS="$LDFLAGS $ao_libs"
-fi
-msg="no libao support for para_audiod/para_write"
-AC_CHECK_HEADERS([ao/ao.h], [
-	], [
-	have_ao="no"
-	AC_MSG_WARN([ao.h not found, $msg])
-])
-if test "$have_ao" = "yes"; then
-	AC_CHECK_LIB([ao], [ao_initialize], [], [
-		have_ao="no"
-		AC_MSG_WARN([ao lib not found or not working, $msg])
-	])
-fi
-if test "$have_ao" = "yes"; then
-	AC_CHECK_HEADERS([pthread.h], [
-		], [
-		have_ao="no"
-		AC_MSG_WARN([pthread.h not found, $msg])
-	])
-fi
-if test "$have_ao" = "yes"; then
-	AC_CHECK_LIB([pthread], [pthread_create], [], [
-		have_ao="no"
-		AC_MSG_WARN([pthread lib not found or not working, $msg])
-	])
-fi
-if test "$have_ao" = "yes"; then
-	AC_SUBST(ao_cppflags)
-	ao_ldflags="$ao_libs -lao -lpthread"
-	AC_SUBST(ao_ldflags)
-fi
-
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
-############################################################# readline
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-
-have_readline="yes"
-AC_ARG_WITH(readline_headers, [AS_HELP_STRING(--with-readline-headers=dir,
-	[look for libreadline header files also in dir])])
-if test -n "$with_readline_headers"; then
-	readline_cppflags="-I$with_readline_headers"
-	CPPFLAGS="$CPPFLAGS $readline_cppflags"
-fi
-
-AC_ARG_WITH(readline_libs, [AS_HELP_STRING(--with-readline-libs=dir,
-	[look for readline library also in dir])])
-if test -n "$with_readline_libs"; then
-	readline_libs="-L$with_readline_libs"
-	LDFLAGS="$LDFLAGS $readline_libs"
-fi
-msg="no interactive cli support"
-AC_CHECK_HEADERS([readline/readline.h], [
-	], [
-	have_readline="no"
-	AC_MSG_WARN([readline/readline.h not found, $msg])
-])
-
-if test "$have_readline" = "yes"; then
-	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_ldflags="$readline_ldflags -lreadline -lcurses"
-		], [], [-lcurses])
-	fi
-	if test "$have_readline" = "no"; then # try with -ltermcap
-                # clear cache
-		AC_MSG_NOTICE([trying again with -ltermcap])
-                unset ac_cv_search_rl_free_keymap 2> /dev/null
-		AC_SEARCH_LIBS([rl_free_keymap], [readline], [
-			have_readline=yes
-			readline_ldflags="$readline_ldflags -lreadline -ltermcap"
-		], [], [-ltermcap])
-	fi
-fi
-
-if test "$have_readline" = "yes"; then
-	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])
-fi
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
+LIB_SUBST_FLAGS(readline)
+UNSTASH_FLAGS
 ############################################################# libsamplerate
-OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LDFLAGS="$LDFLAGS"
-OLD_LIBS="$LIBS"
-
-have_samplerate="yes"
-AC_ARG_WITH(samplerate_headers, [AS_HELP_STRING(--with-samplerate-headers=dir,
-	[look for samplerate headers also in dir])])
-if test -n "$with_samplerate_headers"; then
-	samplerate_cppflags="-I$with_samplerate_headers"
-	CPPFLAGS="$CPPFLAGS $samplerate_cppflags"
-fi
-AC_ARG_WITH(samplerate_libs, [AS_HELP_STRING(--with-samplerate-libs=dir,
-	[look for samplerate libs also in dir])])
-if test -n "$with_samplerate_libs"; then
-	samplerate_libs="-L$with_samplerate_libs"
-	LDFLAGS="$LDFLAGS $samplerate_libs"
-fi
-
-AC_CHECK_HEADER(samplerate.h, [], have_samplerate=no)
-AC_CHECK_LIB([samplerate], [src_process], [], have_samplerate=no, [])
-
-if test "$have_samplerate" = "yes"; then
-	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
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
+STASH_FLAGS
+LIB_ARG_WITH([samplerate], [-lsamplerate])
+HAVE_SAMPLERATE=yes
+AC_CHECK_HEADER(samplerate.h, [], HAVE_SAMPLERATE=no)
+AC_CHECK_LIB([samplerate], [src_process], [], HAVE_SAMPLERATE=no)
+LIB_SUBST_FLAGS(samplerate)
+UNSTASH_FLAGS
+########################################################################## mp4v2
+STASH_FLAGS
+LIB_ARG_WITH([mp4v2], [-lmp4v2])
+HAVE_MP4V2=yes
+AC_CHECK_HEADER([mp4v2/mp4v2.h], [], [HAVE_MP4V2=no])
+AC_CHECK_LIB([mp4v2], [MP4Read], [], [HAVE_MP4V2=no])
+LIB_SUBST_FLAGS(mp4v2)
+UNSTASH_FLAGS
 ######################################################################### 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"
@@ -758,6 +425,7 @@ if test \( "$have_openssl" = "yes" -o "$have_gcrypt" = "yes" \) \
 		close_on_fork
 		mm
 		crypt_common
+		base64
 		ipc
 		dccp_send
 		fd
@@ -782,36 +450,28 @@ if test \( "$have_openssl" = "yes" -o "$have_gcrypt" = "yes" \) \
 		version
 		ggo
 	"
-	if test "$have_openssl" = "yes"; then
+	if test "$CRYPTOLIB" = openssl; then
 		server_errlist_objs="$server_errlist_objs crypt"
-	fi
-	if test "$have_gcrypt" = "yes"; then
+	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"
-	if test "$have_opus" = "yes"; then
-		server_errlist_objs="$server_errlist_objs opus_afh opus_common"
-	fi
-	if test "$have_faad" = "yes"; then
+	NEED_OPUS_OBJECTS() && server_errlist_objs="$server_errlist_objs opus_afh opus_common"
+	NEED_FLAC_OBJECTS && server_errlist_objs="$server_errlist_objs flac_afh"
+	if test $HAVE_FAAD = yes && test $HAVE_MP4V2 = yes; then
 		server_errlist_objs="$server_errlist_objs aac_afh aac_common"
 	fi
-	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
 		net
@@ -825,41 +485,29 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
 		client_common
 		buffer_tree
 		crypt_common
+		base64
 		version
-		ggo
 	"
-	if test "$have_openssl" = "yes"; then
+	if test "$CRYPTOLIB" = openssl; then
 		client_errlist_objs="$client_errlist_objs crypt"
-	fi
-	if test "$have_gcrypt" = "yes"; then
+	else
 		client_errlist_objs="$client_errlist_objs gcrypt"
 	fi
-	if test "$have_readline" = "yes"; then
+	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)
+	client_objs="$client_errlist_objs"
+	AC_SUBST(client_objs, add_dot_o($client_errlist_objs))
 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
-		http_recv
-		dccp_recv
-		file_write
-		client
-		amp_filter
-		udp_recv
-		prebuffer_filter
-		sync_filter
 	"
 	audiod_errlist_objs="$audiod_errlist_objs
 		audiod
@@ -869,6 +517,7 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
 		stat
 		net
 		crypt_common
+		base64
 		sideband
 		time
 		grab_client
@@ -899,15 +548,13 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
 		buffer_tree
 		sync_filter
 	"
-	if test "$have_openssl" = "yes"; then
+	if test "$CRYPTOLIB" = openssl; then
 		audiod_errlist_objs="$audiod_errlist_objs crypt"
-	fi
-	if test "$have_gcrypt" = "yes"; 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"
@@ -917,43 +564,36 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
 		audiod_errlist_objs="$audiod_errlist_objs spxdec_filter spx_common"
 		audiod_audio_formats="$audiod_audio_formats spx"
 	}
-	if test "$have_opus" = "yes"; then
+	NEED_OPUS_OBJECTS && {
 		audiod_errlist_objs="$audiod_errlist_objs opusdec_filter opus_common"
 		audiod_audio_formats="$audiod_audio_formats opus"
-	fi
-	if test "$have_faad" = "yes"; then
+	}
+	NEED_FLAC_OBJECTS && {
+		audiod_errlist_objs="$audiod_errlist_objs flacdec_filter"
+		audiod_audio_formats="$audiod_audio_formats flac"
+	}
+	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
+	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
+	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
+	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
+	NEED_AO_OBJECTS && {
 		audiod_errlist_objs="$audiod_errlist_objs ao_write"
-		audiod_cmdline_objs="$audiod_cmdline_objs ao_write"
-	fi
-	if test "$have_samplerate" = "yes"; then
+	}
+	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,
@@ -964,26 +604,22 @@ else
 	build_audiod="no"
 fi
 ########################################################################### fade
-if test "$have_oss" = "yes" -o "$have_alsa" = "yes"; then
+if test $HAVE_OSS = yes -o $HAVE_ALSA = yes; then
 	build_fade="yes"
 	executables="$executables fade"
-	fade_cmdline_objs="fade"
-	fade_errlist_objs="fade exec string fd version ggo"
-	if test "$have_oss" = "yes"; then
+	fade_errlist_objs="fade exec string fd version"
+	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
+	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"
+	fade_objs="$fade_errlist_objs"
 	AC_SUBST(fade_objs, add_dot_o($fade_objs))
-	AC_DEFINE_UNQUOTED(INIT_FADE_ERRLISTS,
-		objlist_to_errlist($fade_errlist_objs),
-		errors used by para_fade)
 	enum="$(
 		for i in $mixers; do
 			printf "${i}_MIX, " | tr '[a-z]' '[A-Z]'
@@ -1009,7 +645,7 @@ else
 	AC_MSG_WARN([no mixer support])
 fi
 ########################################################################### gui
-if test "$have_curses" = "yes"; then
+if test $HAVE_CURSES = yes; then
 	build_gui="yes"
 	executables="$executables gui"
 	gui_cmdline_objs="gui"
@@ -1029,22 +665,11 @@ if test "$have_curses" = "yes"; then
 	"
 	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
@@ -1072,65 +697,24 @@ filter_errlist_objs="
 "
 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"
-}
-if test "$have_opus" = "yes"; then
-	filters="$filters opusdec"
-	filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common"
-fi
-if test "$have_faad" = "yes"; then
+NEED_VORBIS_OBJECTS && filter_errlist_objs="$filter_errlist_objs oggdec_filter"
+NEED_SPEEX_OBJECTS && filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common"
+NEED_OPUS_OBJECTS && filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common"
+NEED_FLAC_OBJECTS && filter_errlist_objs="$filter_errlist_objs flacdec_filter"
+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"
+if test $HAVE_MAD = yes; then
 	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
+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
@@ -1142,7 +726,6 @@ recv_errlist_objs="
 	fd
 	sched
 	stdout
-	ggo
 	udp_recv
 	buffer_tree
 	afh_recv
@@ -1152,25 +735,17 @@ recv_errlist_objs="
 	mp3_afh
 	version
 "
-if NEED_OGG_OBJECTS || test "$have_opus" = 'yes'; then
-	recv_errlist_objs="$recv_errlist_objs ogg_afh_common"
-fi
+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"
-if test "$have_opus" = "yes"; then
-	recv_errlist_objs="$recv_errlist_objs opus_afh opus_common"
-fi
-if test "$have_faad" = "yes"; then
+NEED_OPUS_OBJECTS && recv_errlist_objs="$recv_errlist_objs opus_afh opus_common"
+NEED_FLAC_OBJECTS && recv_errlist_objs="$recv_errlist_objs flac_afh"
+
+if test $HAVE_FAAD = yes -a $HAVE_MP4V2 = 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")
+recv_objs="$recv_errlist_objs"
 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"
@@ -1186,9 +761,7 @@ afh_errlist_objs="
 	version
 	ggo
 "
-if NEED_OGG_OBJECTS || test "$have_opus" = 'yes'; then
-	afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
-fi
+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"
@@ -1197,30 +770,27 @@ NEED_SPEEX_OBJECTS && {
 	afh_errlist_objs="$afh_errlist_objs spx_afh spx_common"
 	audio_format_handlers="$audio_format_handlers spx"
 }
-if test "$have_opus" = "yes"; then
+NEED_OPUS_OBJECTS && {
 	afh_errlist_objs="$afh_errlist_objs opus_afh opus_common"
 	audio_format_handlers="$audio_format_handlers opus"
-fi
-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
+}
+NEED_FLAC_OBJECTS && {
 	afh_errlist_objs="$afh_errlist_objs flac_afh"
 	audio_format_handlers="$audio_format_handlers flac"
+}
+if test $HAVE_FAAD = yes -a $HAVE_MP4V2 = yes; then
+	afh_errlist_objs="$afh_errlist_objs aac_afh aac_common"
+	audio_format_handlers="$audio_format_handlers aac"
 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
@@ -1249,73 +819,56 @@ play_errlist_objs="
 	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
-if NEED_OGG_OBJECTS || test "$have_opus" = 'yes'; then
-	play_errlist_objs="$play_errlist_objs ogg_afh_common"
 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"
 }
-if test "$have_opus" = "yes"; then
-	play_errlist_objs="$play_errlist_objs opusdec_filter opus_afh opus_common"
+NEED_OPUS_OBJECTS &&
+	play_errlist_objs="$play_errlist_objs
+		opusdec_filter
+		opus_afh
+		opus_common
+	"
+NEED_FLAC_OBJECTS && {
+	play_errlist_objs="$play_errlist_objs flacdec_filter flac_afh"
+}
+if test $HAVE_FAAD = yes; then
+	play_errlist_objs="$play_errlist_objs aacdec_filter"
 fi
-if test "$have_faad" = "yes"; then
-	play_errlist_objs="$play_errlist_objs aacdec_filter aac_afh aac_common"
+if test $HAVE_MP4V2 = yes; then
+	play_errlist_objs="$play_errlist_objs aac_afh"
 fi
-if test "$have_mad" = "yes"; then
-	play_cmdline_objs="$play_cmdline_objs mp3dec_filter"
-	play_errlist_objs="$play_errlist_objs mp3dec_filter"
+if test $HAVE_MP4V2 = yes || test $HAVE_FAAD = yes; then
+	play_errlist_objs="$play_errlist_objs aac_common"
 fi
-if test "$have_flac" = "yes"; then
-	play_errlist_objs="$play_errlist_objs flacdec_filter flac_afh"
+if test $HAVE_MAD = yes; then
+	play_errlist_objs="$play_errlist_objs mp3dec_filter"
 fi
-if test "$have_oss" = "yes"; then
+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
+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
+NEED_AO_OBJECTS && {
 	play_errlist_objs="$play_errlist_objs ao_write"
-	play_cmdline_objs="$play_cmdline_objs ao_write"
-fi
-if test "$have_readline" = "yes"; then
+}
+if test $HAVE_READLINE = yes; then
 	play_errlist_objs="$play_errlist_objs interactive"
 fi
-if test "$have_samplerate" = "yes"; then
+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"
+play_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
@@ -1326,63 +879,33 @@ write_errlist_objs="
 	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
+NEED_AO_OBJECTS && {
 	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
+}
+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
+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"
+write_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
+if test $HAVE_READLINE = yes; then
 	audioc_errlist_objs="$audioc_errlist_objs
 		buffer_tree
 		interactive
@@ -1390,54 +913,8 @@ if test "$have_readline" = "yes"; then
 		time
 	"
 fi
-audioc_objs="add_cmdline($audioc_cmdline_objs) $audioc_errlist_objs"
+audioc_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="
-	$recv_errlist_objs
-	$filter_errlist_objs
-	$audioc_errlist_objs
-	$write_errlist_objs
-	$afh_errlist_objs
-	$play_errlist_objs
-"
-
-# optional executables
-if test "$build_server" = "yes"; then
-	all_errlist_objs="$all_errlist_objs $server_errlist_objs"
-fi
-if test "$build_gui" = "yes"; then
-	all_errlist_objs="$all_errlist_objs $gui_errlist_objs"
-fi
-if test "$build_fade" = "yes"; then
-	all_errlist_objs="$all_errlist_objs $fade_errlist_objs"
-fi
-if test "$build_client" = "yes"; then
-	all_errlist_objs="$all_errlist_objs $client_errlist_objs"
-fi
-if test "$build_audiod" = "yes"; then
-	all_errlist_objs="$all_errlist_objs $audiod_errlist_objs"
-fi
-
-all_errlist_objs="$(echo $all_errlist_objs | tr ' ' '\n' | sort | uniq)"
-
-object_executable_matrix=
-for i in $executables; do
-	eval objs=\$${i}_errlist_objs
-	object_executable_matrix="$object_executable_matrix $i: $objs"
-done
-# use echo to replace newlines by space
-AC_SUBST(object_executable_matrix, $(echo $object_executable_matrix))
-
-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]
-)
 ################################################################## status items
 
 status_items="basename status num_played mtime bitrate frequency file_size
@@ -1471,14 +948,14 @@ 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: $filters
-writers: $writers
+readline (interactive CLIs): $HAVE_READLINE
+id3 version 2 support: $HAVE_ID3TAG
+faad: $HAVE_FAAD
+mp4v2: $HAVE_MP4V2
+audio format handlers: $audio_format_handlers
 
-para_fade: $build_fade
 para_server: $build_server
 para_gui: $build_gui
 para_fade: $build_fade