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

diff --git a/configure.ac b/configure.ac
index 20b8b52c..7224e4e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,7 +118,23 @@ 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
+######################################################################## 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"
@@ -126,96 +142,32 @@ 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"
+"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
-	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
+	if test $HAVE_OPENSSL = yes; then
+		CRYPTOLIB=openssl
+		crypto_ldflags="$openssl_ldflags"
 	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
+	;;
+*)
+	AC_MSG_ERROR([invalid value "$enable_cryptolib" for --enable-cryptolib])
+	;;
+esac
+AC_SUBST(crypto_ldflags)
 ########################################################################### libsocket
 AC_CHECK_LIB([c], [socket],
 	[socket_ldlflags=],
@@ -331,113 +283,48 @@ 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'
+	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'
 }])
-####################################################### ogg/vorbis/speex/opus
-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])])
-
-have_speex="yes"
-have_opus="yes"
-if test "$HAVE_OGG" = 'yes'; then
-
-	# speex
-	OLD_CPPFLAGS="$CPPFLAGS"
-	OLD_LDFLAGS="$LDFLAGS"
-	OLD_LIBS="$LIBS"
-	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" ])
-	CPPFLAGS="$OLD_CPPFLAGS"
-	LDFLAGS="$OLD_LDFLAGS"
-	LIBS="$OLD_LIBS"
-
-	# 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_speex="no"
-	have_opus="no"
-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)
-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)
-	audio_format_handlers="$audio_format_handlers opus"
-else
-	AC_MSG_WARN([no ogg/opus $msg])
-fi
+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
-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"
@@ -755,9 +642,7 @@ 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"
@@ -800,23 +685,16 @@ 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"
-	if test "$have_speex" = "yes"; then
-		server_errlist_objs="$server_errlist_objs spx_afh spx_common"
-	fi
-	if test "$have_opus" = "yes"; then
-		server_errlist_objs="$server_errlist_objs opus_afh opus_common"
-	fi
-	if test "$have_faad" = "yes"; then
-		server_errlist_objs="$server_errlist_objs aac_afh aac_common"
-	fi
+	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
@@ -828,7 +706,7 @@ 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"
@@ -848,10 +726,9 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
 		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
@@ -865,7 +742,7 @@ 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"
@@ -919,10 +796,9 @@ 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
@@ -933,15 +809,15 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
 		audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
 		audiod_audio_formats="$audiod_audio_formats ogg"
 	}
-	if test "$have_speex" = "yes"; then
+	NEED_SPEEX_OBJECTS && {
 		audiod_errlist_objs="$audiod_errlist_objs spxdec_filter spx_common"
 		audiod_audio_formats="$audiod_audio_formats spx"
-	fi
-	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
+	}
+	if test $HAVE_FAAD = yes; then
 		audiod_errlist_objs="$audiod_errlist_objs aacdec_filter aac_common"
 		audiod_audio_formats="$audiod_audio_formats aac"
 	fi
@@ -1101,15 +977,15 @@ NEED_VORBIS_OBJECTS && {
 	filters="$filters oggdec"
 	filter_errlist_objs="$filter_errlist_objs oggdec_filter"
 }
-if test "$have_speex" = "yes"; then
+NEED_SPEEX_OBJECTS && {
 	filters="$filters spxdec"
 	filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common"
-fi
-if test "$have_opus" = "yes"; then
+}
+NEED_OPUS_OBJECTS && {
 	filters="$filters opusdec"
 	filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common"
-fi
-if test "$have_faad" = "yes"; then
+}
+if test $HAVE_FAAD = yes; then
 	filter_errlist_objs="$filter_errlist_objs aacdec_filter aac_common"
 	filters="$filters aacdec"
 fi
@@ -1172,17 +1048,12 @@ recv_errlist_objs="
 	mp3_afh
 	version
 "
-if NEED_OGG_OBJECTS || test "$have_speex" = 'yes' || 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"
-if test "$have_speex" = "yes"; then
-	recv_errlist_objs="$recv_errlist_objs spx_afh spx_common"
-fi
-if test "$have_opus" = "yes"; then
-	recv_errlist_objs="$recv_errlist_objs opus_afh opus_common"
-fi
-if test "$have_faad" = "yes"; then
+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
@@ -1208,22 +1079,20 @@ afh_errlist_objs="
 	version
 	ggo
 "
-if NEED_OGG_OBJECTS || test "$have_speex" = 'yes' || 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"
 }
-if test "$have_speex" = "yes"; then
+NEED_SPEEX_OBJECTS && {
 	afh_errlist_objs="$afh_errlist_objs spx_afh spx_common"
 	audio_format_handlers="$audio_format_handlers spx"
-fi
-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
+}
+if test $HAVE_FAAD = yes; then
 	afh_errlist_objs="$afh_errlist_objs aac_common aac_afh"
 	audio_format_handlers="$audio_format_handlers aac"
 fi
@@ -1287,19 +1156,20 @@ 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_speex" = 'yes' || 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"
 }
-if test "$have_speex" = "yes"; then
+NEED_SPEEX_OBJECTS && {
 	play_errlist_objs="$play_errlist_objs spxdec_filter spx_afh spx_common"
-fi
-if test "$have_opus" = "yes"; then
-	play_errlist_objs="$play_errlist_objs opusdec_filter opus_afh opus_common"
-fi
-if test "$have_faad" = "yes"; then
+}
+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
@@ -1493,6 +1363,7 @@ 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