X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=c2cb47e6f993c6cbbad343208ce634af8bf80173;hp=98d75c78501e3d22ed934c5395c0c65c96dcd178;hb=a85b3b947174c64ce06b4d6e438677055bf3f1ae;hpb=f6db57bc964bc78f1a7ce521dee2108289cd8b8e diff --git a/configure.ac b/configure.ac index 98d75c78..c2cb47e6 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)], @@ -9,21 +6,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 +35,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,51 +47,21 @@ 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( - [gengetopt is required to build this package]) +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( - [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 executables="recv filter audioc write afh play" -################################################################## clock_gettime -clock_gettime_lib= -AC_CHECK_LIB([c], [clock_gettime], [clock_gettime_lib=c], [ - AC_CHECK_LIB([rt], [clock_gettime], [clock_gettime_lib=rt], [], []) -]) -if test -n "$clock_gettime_lib"; then - AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [ - define to 1 if clock_gettime() is supported]) -fi -if test "$clock_gettime_lib" = "rt"; then - AC_SUBST(clock_gettime_ldflags, -lrt) -fi - ########################################################################### osl STASH_FLAGS LIB_ARG_WITH([osl], [-losl]) @@ -118,6 +70,22 @@ AC_CHECK_HEADER(osl.h, [], [HAVE_OSL=no]) AC_CHECK_LIB([osl], [osl_open_table], [], [HAVE_OSL=no]) LIB_SUBST_FLAGS(osl) UNSTASH_FLAGS +######################################################################## 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=no]) +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 @@ -125,6 +93,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 +140,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 + ],[ + 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 #include ]], [[ @@ -193,49 +176,15 @@ AC_MSG_RESULT($have_ucred) 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 && -AC_CHECK_DECL( - [gengetopt_args_info_description], - [ggo_descriptions_declared=yes], - [ggo_descriptions_declared=no], - [#include "conftest-ggo.h"] -) -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([[ @@ -247,25 +196,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ ]])],[have_ip_mreqn=yes],[have_ip_mreqn=no]) AC_MSG_RESULT($have_ip_mreqn) if test ${have_ip_mreqn} = yes; then - AC_DEFINE(HAVE_IP_MREQN, 1, define to 1 you have struct ip_mreqn) -fi -########################################################################### osx - -AC_MSG_CHECKING(for CoreAudio (MacOs)) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include -]], [[ - AudioDeviceID id; -]])],[have_core_audio=yes],[have_core_audio=no]) -AC_MSG_RESULT($have_core_audio) -if test ${have_core_audio} = yes; then - f1="-framework CoreAudio" - f2="-framework AudioToolbox" - f3="-framework AudioUnit" - f4="-framework CoreServices" - core_audio_ldflags="$f1 $f2 $f3 $f4" - AC_SUBST(core_audio_ldflags) - AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X) + AC_DEFINE(HAVE_IP_MREQN, 1, define to 1 if you have struct ip_mreqn) fi ########################################################################### ogg STASH_FLAGS @@ -273,6 +204,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 @@ -331,10 +264,12 @@ AC_DEFUN([NEED_FLAC_OBJECTS], [{ }]) ########################################################################### faad STASH_FLAGS -LIB_ARG_WITH([faad], [-lfaad]) +LIB_ARG_WITH([faad], [-lfaad -lmp4ff]) HAVE_FAAD=yes AC_CHECK_HEADER(neaacdec.h, [], HAVE_FAAD=no) +AC_CHECK_HEADER(mp4ff.h, [], HAVE_FAAD=no) AC_CHECK_LIB([faad], [NeAACDecOpen], [], HAVE_FAAD=no) +AC_CHECK_LIB([mp4ff], [mp4ff_meta_get_artist], [], HAVE_FAAD=no) LIB_SUBST_FLAGS(faad) UNSTASH_FLAGS ########################################################################### mad @@ -385,76 +320,24 @@ 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 - #include - ] - ) - 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 + #include + ] +) +LIB_SUBST_FLAGS(readline) +UNSTASH_FLAGS ############################################################# libsamplerate STASH_FLAGS LIB_ARG_WITH([samplerate], [-lsamplerate]) @@ -467,7 +350,6 @@ UNSTASH_FLAGS if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then build_server="yes" executables="$executables server" - server_cmdline_objs="server" server_errlist_objs=" server afh_common @@ -483,6 +365,7 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then close_on_fork mm crypt_common + base64 ipc dccp_send fd @@ -505,7 +388,6 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then wma_common sideband version - ggo " if test "$CRYPTOLIB" = openssl; then server_errlist_objs="$server_errlist_objs crypt" @@ -517,11 +399,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" - server_objs="add_cmdline($server_cmdline_objs) $server_errlist_objs" + if test $HAVE_FAAD = yes; then + server_errlist_objs="$server_errlist_objs aac_afh" + fi + server_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 @@ -529,7 +411,6 @@ fi if test -n "$CRYPTOLIB"; then build_client="yes" executables="$executables client" - client_cmdline_objs="client" client_errlist_objs=" client net @@ -543,21 +424,19 @@ if test -n "$CRYPTOLIB"; then client_common buffer_tree crypt_common + base64 version - ggo " if test "$CRYPTOLIB" = openssl; then client_errlist_objs="$client_errlist_objs crypt" else client_errlist_objs="$client_errlist_objs gcrypt" fi - if test "$have_readline" = "yes"; then + 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 @@ -566,18 +445,6 @@ 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 signal @@ -586,6 +453,7 @@ if test -n "$CRYPTOLIB"; then stat net crypt_common + base64 sideband time grab_client @@ -603,7 +471,6 @@ if test -n "$CRYPTOLIB"; then audiod_command fecdec_filter client_common - ggo udp_recv color fec @@ -621,10 +488,6 @@ if test -n "$CRYPTOLIB"; 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" audiod_audio_formats="$audiod_audio_formats ogg" @@ -642,34 +505,27 @@ if test -n "$CRYPTOLIB"; then audiod_audio_formats="$audiod_audio_formats flac" } if test $HAVE_FAAD = yes; then - audiod_errlist_objs="$audiod_errlist_objs aacdec_filter aac_common" + audiod_errlist_objs="$audiod_errlist_objs aacdec_filter" audiod_audio_formats="$audiod_audio_formats aac" fi if test $HAVE_MAD = yes; then audiod_audio_formats="$audiod_audio_formats mp3" - audiod_cmdline_objs="$audiod_cmdline_objs mp3dec_filter" audiod_errlist_objs="$audiod_errlist_objs mp3dec_filter" fi if test $HAVE_OSS = yes; then audiod_errlist_objs="$audiod_errlist_objs oss_write" - audiod_cmdline_objs="$audiod_cmdline_objs oss_write" fi if test $HAVE_ALSA = yes; then audiod_errlist_objs="$audiod_errlist_objs alsa_write" - audiod_cmdline_objs="$audiod_cmdline_objs alsa_write" fi NEED_AO_OBJECTS && { audiod_errlist_objs="$audiod_errlist_objs ao_write" - audiod_cmdline_objs="$audiod_cmdline_objs ao_write" } 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" + audiod_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, @@ -679,56 +535,27 @@ if test -n "$CRYPTOLIB"; then else build_audiod="no" fi -########################################################################### fade +########################################################################### mixer 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" + build_mixer="yes" + executables="$executables mixer" + mixer_errlist_objs="mixer 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" + mixer_errlist_objs="$mixer_errlist_objs oss_mix" fi if test $HAVE_ALSA = yes; then - fade_errlist_objs="$fade_errlist_objs alsa_mix" - mixers="${mixers}alsa " - default_mixer="ALSA_MIX" + mixer_errlist_objs="$mixer_errlist_objs alsa_mix" 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]' - done - )" - AC_DEFINE_UNQUOTED(MIXER_ENUM, $enum NUM_SUPPORTED_MIXERS, - enum of supported mixers) - AC_DEFINE_UNQUOTED(DEFAULT_MIXER, $default_mixer, - use this mixer if none was specified) - names="$(for i in $mixers; do printf \"$i\",' ' ; done)" - AC_DEFINE_UNQUOTED(MIXER_NAMES, $names, supported mixer names) - inits="$( - for i in $mixers; do - printf 'extern void '$i'_mix_init(struct mixer *); ' - done - )" - AC_DEFINE_UNQUOTED(DECLARE_MIXER_INITS, $inits, - init functions of the supported mixers) - array="$(for i in $mixers; do printf '{.init = '$i'_mix_init},'; done)" - AC_DEFINE_UNQUOTED(MIXER_ARRAY, $array, array of supported mixers) + mixer_objs="$mixer_errlist_objs" + AC_SUBST(mixer_objs, add_dot_o($mixer_objs)) else - build_fade="no" + build_mixer="no" 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" gui_errlist_objs=" exec signal @@ -741,26 +568,14 @@ if test "$have_curses" = "yes"; then time sched version - ggo " - gui_objs="add_cmdline($gui_cmdline_objs) $gui_errlist_objs" + gui_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 @@ -772,7 +587,6 @@ filter_errlist_objs=" sched fd amp_filter - ggo fecdec_filter fec version @@ -786,67 +600,23 @@ filter_errlist_objs=" net sync_filter " -filter_cmdline_objs=" - filter - compress_filter - amp_filter - prebuffer_filter - sync_filter -" -NEED_VORBIS_OBJECTS && { - filters="$filters oggdec" - filter_errlist_objs="$filter_errlist_objs oggdec_filter" -} -NEED_SPEEX_OBJECTS && { - filters="$filters spxdec" - filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common" -} -NEED_OPUS_OBJECTS && { - filters="$filters opusdec" - filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common" -} -NEED_FLAC_OBJECTS && { - filter_errlist_objs="$filter_errlist_objs flacdec_filter" - filters="$filters flacdec" -} +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" + filter_errlist_objs="$filter_errlist_objs aacdec_filter" fi if test $HAVE_MAD = yes; then - filter_cmdline_objs="$filter_cmdline_objs mp3dec_filter" filter_errlist_objs="$filter_errlist_objs mp3dec_filter" - filters="$filters mp3dec" fi if test $HAVE_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" +filter_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 @@ -858,7 +628,6 @@ recv_errlist_objs=" fd sched stdout - ggo udp_recv buffer_tree afh_recv @@ -875,16 +644,12 @@ 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 - recv_errlist_objs="$recv_errlist_objs aac_afh aac_common" + recv_errlist_objs="$recv_errlist_objs aac_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" afh_errlist_objs=" afh string @@ -895,7 +660,6 @@ afh_errlist_objs=" wma_afh wma_common version - ggo " NEED_OGG_OBJECTS && afh_errlist_objs="$afh_errlist_objs ogg_afh_common" NEED_VORBIS_OBJECTS && { @@ -915,21 +679,18 @@ NEED_FLAC_OBJECTS && { audio_format_handlers="$audio_format_handlers flac" } if test $HAVE_FAAD = yes; then - afh_errlist_objs="$afh_errlist_objs aac_common aac_afh" + afh_errlist_objs="$afh_errlist_objs aac_afh" audio_format_handlers="$audio_format_handlers aac" fi -afh_objs="add_cmdline($afh_cmdline_objs) $afh_errlist_objs" +afh_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 @@ -958,22 +719,6 @@ 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 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" @@ -991,41 +736,30 @@ 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 aac_afh aacdec_filter" 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 play_errlist_objs="$play_errlist_objs oss_write" - play_cmdline_objs="$play_cmdline_objs oss_write" fi if test $HAVE_ALSA = yes; then play_errlist_objs="$play_errlist_objs alsa_write" - play_cmdline_objs="$play_cmdline_objs alsa_write" fi 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 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 @@ -1036,63 +770,30 @@ 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 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" } if test $HAVE_OSS = yes; then write_errlist_objs="$write_errlist_objs oss_write" - write_cmdline_objs="$write_cmdline_objs oss_write" - writers="$writers oss" - default_writer="OSS_WRITE" fi if test $HAVE_ALSA = yes; then write_errlist_objs="$write_errlist_objs alsa_write" - write_cmdline_objs="$write_cmdline_objs alsa_write" - writers="$writers alsa" - default_writer="ALSA_WRITE" fi -AC_SUBST(writers) -write_objs="add_cmdline($write_cmdline_objs) $write_errlist_objs" +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 @@ -1100,54 +801,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 @@ -1156,7 +811,7 @@ attributes_txt decoder_flags audiod_status play_time attributes_bitmap offset seconds_total stream_start current_time audiod_uptime image_id lyrics_id duration directory lyrics_name image_name path hash channels last_played num_chunks chunk_time amplification artist title year album -comment" +comment max_chunk_size" result= for i in $status_items; do @@ -1183,16 +838,14 @@ 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 -writers: $writers +faad: $HAVE_FAAD +audio format handlers: $audio_format_handlers -para_fade: $build_fade para_server: $build_server para_gui: $build_gui -para_fade: $build_fade +para_mixer: $build_mixer para_client: $build_client para_audiod: $build_audiod ])