build: Convert faad detection to new macros.
[paraslash.git] / configure.ac
index cdbc0e56b0f51992973076a4ae602ca0a2d1e33a..7224e4e6cc415f5555105b5795e74da3a546d05b 100644 (file)
@@ -3,8 +3,9 @@
 
 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)])
@@ -23,6 +24,46 @@ 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
@@ -55,54 +96,6 @@ 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"
 ################################################################## clock_gettime
 clock_gettime_lib=
@@ -116,42 +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" = "yes"; then
-       AC_SUBST(osl_cppflags)
-       osl_ldflags="$osl_libs -losl"
-       AC_SUBST(osl_ldflags)
-else
-       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
-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"
@@ -159,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"
-       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])
+"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_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=],
@@ -348,149 +267,64 @@ if test ${have_core_audio} = yes; then
        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"
-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"
-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)
-fi
-if test "$have_vorbis" = "yes"; then
-       AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg/vorbis support)
-       vorbis_ldflags="$vorbis_libs -lvorbis -lvorbisfile"
-       AC_SUBST(vorbis_ldflags)
-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
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
+########################################################################### 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
-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"
@@ -580,7 +414,11 @@ 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)
@@ -728,15 +566,17 @@ AC_CHECK_HEADERS([readline/readline.h], [
 ])
 
 if test "$have_readline" = "yes"; then
-       readline_ldflags="$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_ldflags="$readline_ldflags -lcurses"
+                       readline_ldflags="$readline_ldflags -lreadline -lcurses"
                ], [], [-lcurses])
        fi
        if test "$have_readline" = "no"; then # try with -ltermcap
@@ -745,13 +585,21 @@ 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_ldflags="$readline_ldflags -ltermcap"
+                       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)
@@ -794,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"
@@ -839,29 +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
-       if test "$have_vorbis" = "yes" || \
-                       test "$have_speex" = "yes" || \
-                       test "$have_opus" = "yes"; then
-               server_errlist_objs="$server_errlist_objs ogg_afh_common"
-       fi
-       if test "$have_vorbis" = "yes"; then
-               server_errlist_objs="$server_errlist_objs ogg_afh"
-       fi
-       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_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
@@ -873,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"
@@ -893,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
@@ -910,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"
@@ -964,29 +796,28 @@ 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.cmdline"
+               audiod_cmdline_objs="$audiod_cmdline_objs osx_write"
        fi
-       if test "$have_vorbis" = "yes"; then
+       NEED_VORBIS_OBJECTS && {
                audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
                audiod_audio_formats="$audiod_audio_formats ogg"
-       fi
-       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
@@ -1088,6 +919,7 @@ if test "$have_curses" = "yes"; then
                gui
                gui_theme
                time
+               sched
                version
                ggo
        "
@@ -1141,20 +973,19 @@ filter_cmdline_objs="
        prebuffer_filter
        sync_filter
 "
-
-if test "$have_vorbis" = "yes"; then
+NEED_VORBIS_OBJECTS && {
        filters="$filters oggdec"
        filter_errlist_objs="$filter_errlist_objs oggdec_filter"
-fi
-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,6 +1003,8 @@ if test "$have_samplerate" = "yes"; then
        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))
@@ -1215,27 +1048,19 @@ recv_errlist_objs="
        mp3_afh
        version
 "
-if test "$have_vorbis" = "yes" || \
-               test "$have_speex" = "yes" || \
-               test "$have_opus" = "yes"; then
-       recv_errlist_objs="$recv_errlist_objs ogg_afh_common"
-fi
-if test "$have_vorbis" = "yes"; then
-       recv_errlist_objs="$recv_errlist_objs ogg_afh"
-fi
-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_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)
@@ -1254,23 +1079,20 @@ afh_errlist_objs="
        version
        ggo
 "
-if test "$have_vorbis" = "yes" || \
-               test "$have_speex" = "yes" || \
-               test "$have_opus" = "yes"; then
-       afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
-fi
-if test "$have_vorbis" = "yes"; then
+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"
-fi
-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"
-fi
-if test "$have_faad" = "yes"; then
+       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
@@ -1332,23 +1154,22 @@ play_cmdline_objs="
 "
 if test "$have_core_audio" = "yes"; then
        play_errlist_objs="$play_errlist_objs osx_write ipc"
-       play_cmdline_objs="$play_cmdline_objs osx_write.cmdline"
+       play_cmdline_objs="$play_cmdline_objs osx_write"
 fi
-if test "$have_vorbis" = "yes" || \
-               test "$have_speex" = "yes" || \
-               test "$have_opus" = "yes"; then
-       play_errlist_objs="$play_errlist_objs ogg_afh_common"
-fi
-if test "$have_vorbis" = "yes"; then
+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"
-fi
-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
@@ -1406,7 +1227,7 @@ 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.cmdline"
+       write_cmdline_objs="$write_cmdline_objs osx_write"
        writers="$writers osx"
        default_writer="OSX_WRITE"
 fi
@@ -1428,6 +1249,7 @@ if test "$have_alsa" = "yes"; then
        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,
@@ -1502,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]
@@ -1542,11 +1363,12 @@ 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
 
 para_fade: $build_fade