vss: Avoid use after free in vss_send().
[paraslash.git] / configure.ac
index ac4192f..0b00cc2 100644 (file)
@@ -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,32 +48,23 @@ 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_PROG_CC
@@ -125,6 +99,10 @@ LIB_ARG_WITH([openssl], [-lssl -lcrypto])
 AC_CHECK_HEADER(openssl/ssl.h, [], [HAVE_OPENSSL=no])
 AC_CHECK_LIB([crypto], [RAND_bytes], [], [HAVE_OPENSSL=no])
 LIB_SUBST_FLAGS(openssl)
+if test $HAVE_OPENSSL = yes; then
+       AC_CHECK_LIB([crypto], [RSA_set0_key],
+               AC_DEFINE([HAVE_RSA_SET0_KEY], [1], [openssl-1.1]))
+fi
 UNSTASH_FLAGS
 ######################################################################### gcrypt
 STASH_FLAGS
@@ -168,22 +146,33 @@ case "$enable_cryptolib" in
        ;;
 esac
 AC_SUBST(crypto_ldflags)
-########################################################################### libsocket
-AC_CHECK_LIB([c], [socket],
-       [socket_ldlflags=],
-       [socket_ldflags="-lsocket"]
+########################################################################## 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>
 ]], [[
@@ -194,7 +183,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],
@@ -203,39 +192,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([[
@@ -273,6 +237,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
@@ -354,29 +320,12 @@ 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)
-               ]
-       )
-       ],
-       [
-               have_oss="no"
-               AC_MSG_WARN([no sys/soundcard.h $msg])
-       ]
-)
-CPPFLAGS="$OLD_CPPFLAGS"
-LDFLAGS="$OLD_LDFLAGS"
-LIBS="$OLD_LIBS"
-
+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])
@@ -402,108 +351,40 @@ 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
-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"
+######################################################################## 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)],
+       [],
+       [
+               #include <stdio.h>
+               #include <readline/readline.h>
+       ]
+)
+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 -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
        build_server="yes"
@@ -524,6 +405,7 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
                close_on_fork
                mm
                crypt_common
+               base64
                ipc
                dccp_send
                fd
@@ -558,11 +440,11 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then
        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"
        NEED_FLAC_OBJECTS && server_errlist_objs="$server_errlist_objs flac_afh"
-       test $HAVE_FAAD = yes && server_errlist_objs="$server_errlist_objs aac_afh aac_common"
+       if test $HAVE_FAAD = yes && test $HAVE_MP4V2 = yes; then
+               server_errlist_objs="$server_errlist_objs aac_afh aac_common"
+       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
@@ -584,6 +466,7 @@ if test -n "$CRYPTOLIB"; then
                client_common
                buffer_tree
                crypt_common
+               base64
                version
                ggo
        "
@@ -592,13 +475,11 @@ if test -n "$CRYPTOLIB"; 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)
 else
        build_client="no"
 fi
@@ -627,6 +508,7 @@ if test -n "$CRYPTOLIB"; then
                stat
                net
                crypt_common
+               base64
                sideband
                time
                grab_client
@@ -691,7 +573,7 @@ if test -n "$CRYPTOLIB"; then
                audiod_cmdline_objs="$audiod_cmdline_objs mp3dec_filter"
                audiod_errlist_objs="$audiod_errlist_objs mp3dec_filter"
        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
@@ -703,14 +585,12 @@ if test -n "$CRYPTOLIB"; then
                audiod_errlist_objs="$audiod_errlist_objs ao_write"
                audiod_cmdline_objs="$audiod_cmdline_objs ao_write"
        }
-       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,
@@ -721,12 +601,12 @@ 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
+       if test $HAVE_OSS = yes; then
                fade_errlist_objs="$fade_errlist_objs oss_mix"
                mixers="${mixers}oss "
                default_mixer="OSS_MIX"
@@ -738,9 +618,6 @@ if test "$have_oss" = "yes" -o $HAVE_ALSA = yes; then
        fi
        fade_objs="add_cmdline($fade_cmdline_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]'
@@ -766,7 +643,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"
@@ -786,8 +663,6 @@ 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])
@@ -859,7 +734,7 @@ if test $HAVE_MAD = yes; then
        filter_errlist_objs="$filter_errlist_objs mp3dec_filter"
        filters="$filters mp3dec"
 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"
@@ -869,8 +744,6 @@ 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,
@@ -915,14 +788,12 @@ 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"
 NEED_FLAC_OBJECTS && recv_errlist_objs="$recv_errlist_objs flac_afh"
 
-if test $HAVE_FAAD = yes; then
+if test $HAVE_FAAD = yes -a $HAVE_MP4V2 = yes; then
        recv_errlist_objs="$recv_errlist_objs aac_afh aac_common"
 fi
 recv_objs="add_cmdline($recv_cmdline_objs) $recv_errlist_objs"
 AC_SUBST(receivers, "http dccp udp afh")
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
-AC_DEFINE_UNQUOTED(INIT_RECV_ERRLISTS, objlist_to_errlist($recv_errlist_objs),
-       errors used by para_recv)
 ########################################################################### afh
 audio_format_handlers="mp3 wma"
 afh_cmdline_objs="afh"
@@ -955,16 +826,14 @@ NEED_FLAC_OBJECTS && {
        afh_errlist_objs="$afh_errlist_objs flac_afh"
        audio_format_handlers="$audio_format_handlers flac"
 }
-if test $HAVE_FAAD = yes; then
-       afh_errlist_objs="$afh_errlist_objs aac_common aac_afh"
+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
@@ -1032,13 +901,19 @@ 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 aac_afh aac_common"
+       play_errlist_objs="$play_errlist_objs aacdec_filter"
+fi
+if test $HAVE_MP4V2 = yes; then
+       play_errlist_objs="$play_errlist_objs aac_afh"
+fi
+if test $HAVE_MP4V2 = yes || test $HAVE_FAAD = yes; then
+       play_errlist_objs="$play_errlist_objs aac_common"
 fi
 if test $HAVE_MAD = yes; then
        play_cmdline_objs="$play_cmdline_objs mp3dec_filter"
        play_errlist_objs="$play_errlist_objs mp3dec_filter"
 fi
-if test "$have_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
@@ -1050,18 +925,16 @@ NEED_AO_OBJECTS && {
        play_errlist_objs="$play_errlist_objs ao_write"
        play_cmdline_objs="$play_cmdline_objs ao_write"
 }
-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"
 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
@@ -1096,7 +969,7 @@ NEED_AO_OBJECTS && {
        writers="$writers ao"
        default_writer="AO_WRITE"
 }
-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"
@@ -1111,8 +984,6 @@ fi
 AC_SUBST(writers)
 write_objs="add_cmdline($write_cmdline_objs) $write_errlist_objs"
 AC_SUBST(write_objs, add_dot_o($write_objs))
-AC_DEFINE_UNQUOTED(INIT_WRITE_ERRLISTS,
-       objlist_to_errlist($write_errlist_objs), errors used by para_write)
 enum="$(for i in $writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"
 AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
        enum of supported writers)
@@ -1133,7 +1004,7 @@ audioc_errlist_objs="
        version
        ggo
 "
-if test "$have_readline" = "yes"; then
+if test $HAVE_READLINE = yes; then
        audioc_errlist_objs="$audioc_errlist_objs
                buffer_tree
                interactive
@@ -1143,52 +1014,6 @@ if test "$have_readline" = "yes"; then
 fi
 audioc_objs="add_cmdline($audioc_cmdline_objs) $audioc_errlist_objs"
 AC_SUBST(audioc_objs, add_dot_o($audioc_objs))
-AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS,
-       objlist_to_errlist($audioc_errlist_objs), errors used by para_audioc)
-############################################################# error2.h
-# these are always built
-all_errlist_objs="
-       $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
@@ -1224,13 +1049,15 @@ paraslash configuration:
 ~~~~~~~~~~~~~~~~~~~~~~~~
 crypto lib: ${CRYPTOLIB:-[none]}
 unix socket credentials: $have_ucred
-readline (interactive CLIs): $have_readline
-audio formats handlers: $audio_format_handlers
+readline (interactive CLIs): $HAVE_READLINE
 id3 version 2 support: $HAVE_ID3TAG
-filters: $filters
+faad: $HAVE_FAAD
+mp4v2: $HAVE_MP4V2
+
+audio format handlers: $audio_format_handlers
+filters: $(echo $filters)
 writers: $writers
 
-para_fade: $build_fade
 para_server: $build_server
 para_gui: $build_gui
 para_fade: $build_fade