X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=e6647e22859b58e9e6a0c41f19f157bd16c3eaee;hp=98b6ea2834d88db5c36aa8bbc96b25ee998e8150;hb=263a00133b367572d0a8124fcb67225797e640e7;hpb=e3647569f0dec8a5c54d4e858dc21ef73ada90f9 diff --git a/configure.ac b/configure.ac index 98b6ea28..e6647e22 100644 --- a/configure.ac +++ b/configure.ac @@ -1,12 +1,14 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.60) +AC_PREREQ([2.61]) - -AC_INIT(paraslash, [git], maan@systemlinux.org) +AC_INIT([paraslash],[0.5.0],[maan@systemlinux.org]) AC_CONFIG_HEADER([config.h]) +AC_CONFIG_FILES([Makefile]) +AC_DEFUN([add_dot_o],[$(for i in $@; do printf "$i.o "; done)]) +AC_DEFUN([objlist_to_errlist],[$(for i in $@; do printf "DEFINE_ERRLIST($(echo $i| tr 'a-z' 'A-Z'));"; done) [const char **para_errlist[[]]] = {$(for i in $@; do printf "PARA_ERRLIST($(echo $i | tr 'a-z' 'A-Z')), "; done) }]) AC_PATH_PROG(UNAMEPATH, uname, no) if test "$UNAMEPATH" = "no"; then AC_MSG_ERROR(unable to determine system type) @@ -34,6 +36,7 @@ test -z "$help2man" && AC_MSG_ERROR( AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL +AC_SUBST(install_sh, [$INSTALL]) AC_REPLACE_FNMATCH AC_HEADER_DIRENT @@ -74,7 +77,6 @@ AC_FUNC_MKTIME AC_FUNC_MMAP AC_FUNC_REALLOC AC_FUNC_SELECT_ARGTYPES -AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_STRFTIME AC_FUNC_VPRINTF @@ -87,83 +89,116 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \ strncasecmp strrchr strspn alarm mkdir inet_ntoa socket], [], [AC_MSG_ERROR([function not found, cannot live without it])]) -cmdline_dir="cmdline" -AC_SUBST(cmdline_dir) AC_DEFUN([add_cmdline],[$(for i in $@; do printf "${i}.cmdline "; done)]) -all_errlist_objs="server mp3_afh afh_common vss command net string signal time -daemon stat http_send close_on_fork ipc acl afh fade amp_filter -dccp_send fd user_list chunk_queue afs aft mood score attribute blob ringbuffer -playlist sched audiod grab_client filter_common wav_filter compress_filter -http_recv dccp_recv recv_common write_common file_write audiod_command -client_common recv stdout filter stdin audioc write client exec send_common ggo -udp_recv udp_send color fec fecdec_filter prebuffer_filter mm -server_command_list afs_command_list audiod_command_list bitstream imdct wma_afh -wma_common wmadec_filter buffer_tree crypt_common gui gui_theme -" +all_errlist_objs="mp3_afh afh_common net string signal time daemon + stat afh amp_filter fd ringbuffer sched audiod + grab_client filter_common wav_filter compress_filter http_recv + dccp_recv recv_common write_common file_write audiod_command + client_common recv stdout filter stdin audioc write client + exec send_common ggo udp_recv color fec fecdec_filter + prebuffer_filter bitstream imdct check_wav + wma_afh wma_common wmadec_filter buffer_tree crypt_common + gui gui_theme sideband afh_recv play version" + +executables="recv filter audioc write client afh audiod play" -executables="recv filter audioc write client afh audiod" +recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv afh_recv)" -recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv)" +recv_errlist_objs=" + http_recv recv_common recv time string net dccp_recv fd + sched stdout ggo udp_recv buffer_tree afh_recv afh_common + wma_afh wma_common mp3_afh version +" -recv_errlist_objs="http_recv recv_common recv time string net dccp_recv - fd sched stdout ggo udp_recv fec buffer_tree" recv_ldflags="" filter_cmdline_objs="add_cmdline(filter compress_filter amp_filter prebuffer_filter)" filter_errlist_objs="filter_common wav_filter compress_filter filter string - stdin stdout sched fd amp_filter ggo fecdec_filter fec + stdin stdout sched fd amp_filter ggo fecdec_filter fec version prebuffer_filter time bitstream imdct wma_common wmadec_filter buffer_tree" filter_ldflags="-lm" filters=" compress wav amp fecdec wmadec prebuffer" audioc_cmdline_objs="add_cmdline(audioc)" -audioc_errlist_objs="audioc string net fd" +audioc_errlist_objs=" + audioc + string + net + fd + version + ggo +" audioc_ldflags="" audiod_cmdline_objs="add_cmdline(audiod compress_filter http_recv dccp_recv file_write client amp_filter udp_recv prebuffer_filter)" -audiod_errlist_objs="audiod signal string daemon stat net crypt_common +audiod_errlist_objs="audiod signal string daemon stat net crypt_common sideband time grab_client filter_common wav_filter compress_filter amp_filter http_recv dccp_recv recv_common fd sched write_common file_write audiod_command fecdec_filter - client_common ggo udp_recv color fec prebuffer_filter audiod_command_list + client_common ggo udp_recv color fec prebuffer_filter version bitstream imdct wma_common wmadec_filter buffer_tree" audiod_ldflags="-lm" audiod_audio_formats="wma" afh_cmdline_objs="add_cmdline(afh)" -afh_errlist_objs="afh string fd mp3_afh afh_common time wma_afh wma_common" +afh_errlist_objs="afh string fd mp3_afh afh_common time wma_afh wma_common + version ggo" afh_ldflags="" -server_cmdline_objs="add_cmdline(server)" -server_errlist_objs="server afh_common mp3_afh vss command net string signal - time daemon http_send close_on_fork mm crypt_common - ipc dccp_send fd user_list chunk_queue afs aft mood score attribute - blob playlist sched acl send_common udp_send color fec - server_command_list afs_command_list wma_afh wma_common" -server_ldflags="" -server_audio_formats="mp3 wma" - write_cmdline_objs="add_cmdline(write file_write)" write_errlist_objs="write write_common file_write time fd string sched stdin - buffer_tree ggo" + buffer_tree ggo check_wav version" write_ldflags="" writers=" file" default_writer="FILE_WRITE" client_cmdline_objs="add_cmdline(client)" -client_errlist_objs="client net string fd sched stdin stdout time - client_common buffer_tree crypt_common" +client_errlist_objs=" + client + net + string + fd + sched + stdin + stdout + time + sideband + client_common + buffer_tree + crypt_common + version + ggo +" client_ldflags="" gui_cmdline_objs="add_cmdline(gui)" -gui_errlist_objs="exec signal string stat ringbuffer fd gui gui_theme" +gui_errlist_objs=" + exec + signal + string + stat + ringbuffer + fd + gui + gui_theme + time + version + ggo +" gui_objs="$gui_cmdline_objs $gui_errlist_objs" - -fade_cmdline_objs="add_cmdline(fade)" -fade_errlist_objs="fade exec string fd" - - +play_errlist_objs="play fd sched ggo buffer_tree time string net + afh_recv afh_common + wma_afh wma_common mp3_afh + recv_common udp_recv http_recv dccp_recv + filter_common fec bitstream imdct + wav_filter compress_filter amp_filter prebuffer_filter fecdec_filter + wmadec_filter + write_common file_write + version +" +play_cmdline_objs="add_cmdline(http_recv dccp_recv udp_recv afh_recv compress_filter amp_filter prebuffer_filter file_write play)" +play_ldflags="-lm" ########################################################################### snprintf # =========================================================================== # http://www.nongnu.org/autoconf-archive/ax_func_snprintf.html @@ -193,8 +228,8 @@ AC_DEFUN([AX_FUNC_SNPRINTF], [AC_CHECK_FUNCS(snprintf vsnprintf) AC_MSG_CHECKING(for working snprintf) AC_CACHE_VAL(ac_cv_have_working_snprintf, -[AC_TRY_RUN( -[#include +[AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include int main(void) { @@ -208,12 +243,12 @@ int main(void) if (strcmp (bufd, "1")) exit (1); if (i != 3) exit (1); exit(0); -}], ac_cv_have_working_snprintf=yes, ac_cv_have_working_snprintf=no, ac_cv_have_working_snprintf=cross)]) +}]])],[ac_cv_have_working_snprintf=yes], +[ac_cv_have_working_snprintf=no],[ac_cv_have_working_snprintf=cross])]) AC_MSG_RESULT([$ac_cv_have_working_snprintf]) AC_MSG_CHECKING(for working vsnprintf) AC_CACHE_VAL(ac_cv_have_working_vsnprintf, -[AC_TRY_RUN( -[#include +[AC_RUN_IFELSE([AC_LANG_SOURCE([[#include #include int my_vsnprintf (char *buf, const char *tmpl, ...) @@ -238,24 +273,37 @@ int main(void) if (strcmp (bufd, "1")) exit (1); if (i != 3) exit (1); exit(0); -}], ac_cv_have_working_vsnprintf=yes, ac_cv_have_working_vsnprintf=no, ac_cv_have_working_vsnprintf=cross)]) +}]])],[ac_cv_have_working_vsnprintf=yes], +[ac_cv_have_working_vsnprintf=no],[ac_cv_have_working_vsnprintf=cross])]) AC_MSG_RESULT([$ac_cv_have_working_vsnprintf]) if test x$ac_cv_have_working_snprintf$ac_cv_have_working_vsnprintf != "xyesyes"; then AC_MSG_ERROR([fatal: buggy snprintf() detected]) fi]) AX_FUNC_SNPRINTF() +################################################################## 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 have_osl=yes OLD_CPPFLAGS="$CPPFLAGS" OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" -AC_ARG_WITH(osl_headers, [AC_HELP_STRING(--with-osl-headers=dir, +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, [AC_HELP_STRING(--with-osl-libs=dir, +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" @@ -274,6 +322,51 @@ or execute else extras="$extras server" executables="$executables server" + server_cmdline_objs="add_cmdline(server)" + server_errlist_objs=" + server + afh_common + mp3_afh + vss command + net + string + signal + time + daemon + http_send + close_on_fork + mm + crypt_common + ipc dccp_send + fd + user_list + chunk_queue + afs + aft + mood + score + attribute + blob + playlist + sched + acl + send_common + udp_send + color + fec + wma_afh + wma_common + sideband + version + ggo + " + all_errlist_objs="$all_errlist_objs server vss command + http_send close_on_fork mm ipc dccp_send user_list + chunk_queue afs aft mood score attribute blob playlist + acl udp_send" + + server_ldflags="" + audio_format_handlers="mp3 wma" AC_SUBST(osl_cppflags) server_ldflags="$server_ldflags $osl_libs -losl" fi @@ -300,13 +393,13 @@ if test "$check_openssl" = "yes"; then OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_openssl="yes" - AC_ARG_WITH(openssl_headers, [AC_HELP_STRING(--with-openssl-headers=dir, + 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, [AC_HELP_STRING(--with-openssl-libs=dir, + 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" @@ -357,13 +450,13 @@ if test "$check_gcrypt" = "yes"; then OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_gcrypt="yes" - AC_ARG_WITH(gcrypt_headers, [AC_HELP_STRING(--with-gcrypt-headers=dir, + 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, [AC_HELP_STRING(--with-gcrypt-libs=dir, + 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" @@ -423,30 +516,38 @@ AC_SEARCH_LIBS([inet_ntoa],[nsl],[],[ ],[]) ########################################################################### ucred AC_MSG_CHECKING(for struct ucred) -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #define _GNU_SOURCE #include #include -],[ +]], [[ struct ucred sucred; sucred.pid=0; -],[have_ucred=yes],[have_ucred=no]) +]])],[have_ucred=yes],[have_ucred=no]) 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_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" -AC_ARG_WITH(curses_headers, [AC_HELP_STRING(--with-curses-headers=dir, +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, [AC_HELP_STRING(--with-curses-libs=dir, +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" @@ -455,16 +556,21 @@ fi AC_CHECK_HEADER(curses.h, [], [ have_curses="no" ]) -AC_CHECK_LIB([curses], [initscr], [], [ - have_curses="no" -]) +gui_ldflags="$curses_libs" +AC_CHECK_LIB([ncursesw], [initscr], + [gui_ldflags="$curses_libs -lncursesw"], [ + AC_CHECK_LIB([curses], [initscr], + [gui_ldflags="$curses_libs -lcurses"], + [have_curses="no"] + ) + ] +) if test "$have_curses" = "yes"; then AC_SUBST(curses_cppflags) - AC_DEFINE(HAVE_NCURSES, 1, [define to 1 to turn on curses support]) extras="$extras gui" executables="$executables gui" else - AC_MSG_WARN([cannot build para_gui]) + AC_MSG_WARN([no curses lib, cannot build para_gui]) fi CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" @@ -472,13 +578,13 @@ LIBS="$OLD_LIBS" ########################################################################### ip_mreqn AC_MSG_CHECKING(for struct ip_mreqn (UDPv4 multicast)) -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include #include -],[ +]], [[ struct ip_mreqn mn; mn.imr_ifindex = 0; -],[have_ip_mreqn=yes],[have_ip_mreqn=no]) +]])],[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) @@ -486,11 +592,11 @@ fi ########################################################################### osx AC_MSG_CHECKING(for CoreAudio (MacOs)) -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include -],[ +]], [[ AudioDeviceID id; -],[have_core_audio=yes],[have_core_audio=no]) +]])],[have_core_audio=yes],[have_core_audio=no]) AC_MSG_RESULT($have_core_audio) if test ${have_core_audio} = yes; then f1="-framework CoreAudio" @@ -500,10 +606,20 @@ if test ${have_core_audio} = yes; then f="$f1 $f2 $f3 $f4" all_errlist_objs="$all_errlist_objs osx_write" + # ipc is linked into para_server server and into the osx writer. If osl + # was not found, para_server will not be built and ipc has not yet been + # added to the list of all objects, so we must add it here. + if test "$have_osl" = "no"; then + all_errlist_objs="$all_errlist_objs ipc" + fi audiod_errlist_objs="$audiod_errlist_objs osx_write ipc" audiod_cmdline_objs="$audiod_cmdline_objs osx_write.cmdline" audiod_ldflags="$audiod_ldflags $f" + play_errlist_objs="$play_errlist_objs osx_write ipc" + play_cmdline_objs="$play_cmdline_objs osx_write.cmdline" + play_ldflags="$play_ldflags $f" + write_errlist_objs="$write_errlist_objs osx_write ipc" write_cmdline_objs="$write_cmdline_objs osx_write.cmdline" write_ldflags="$write_ldflags $f" @@ -511,23 +627,27 @@ if test ${have_core_audio} = yes; then default_writer="OSX_WRITE" AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X) fi -########################################################### ogg/vorbis/speex +####################################################### ogg/vorbis/speex/opus have_ogg="yes" OLD_CPPFLAGS="$CPPFLAGS" OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" -AC_ARG_WITH(ogg_headers, [AC_HELP_STRING(--with-ogg-headers=dir, +AC_ARG_WITH(ogg_headers, [AS_HELP_STRING(--with-ogg-headers=dir, [look for ogg headers also in dir])]) -AC_ARG_WITH(ogg_libs, [AC_HELP_STRING(--with-ogg-libs=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, [AC_HELP_STRING(--with-vorbis-headers=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, [AC_HELP_STRING(--with-vorbis-libs=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, [AC_HELP_STRING(--with-speex-headers=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, [AC_HELP_STRING(--with-speex-libs=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" @@ -542,6 +662,7 @@ 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 @@ -566,13 +687,29 @@ if test "$have_ogg" = "yes"; then 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 + speex_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"; then +if test "$have_vorbis" = "yes" || \ + test "$have_speex" = "yes" || \ + test "$have_opus" = "yes"; then AC_SUBST(ogg_cppflags) ogg_libs="$ogg_libs -logg" if test "$OSTYPE" = "Darwin"; then @@ -581,12 +718,14 @@ if test "$have_vorbis" = "yes" || test "$have_speex" = "yes"; then server_ldflags="$server_ldflags $ogg_libs" filter_ldflags="$filter_ldflags $ogg_libs" audiod_ldflags="$audiod_ldflags $ogg_libs" + play_ldflags="$play_ldflags $ogg_libs" afh_ldflags="$afh_ldflags $ogg_libs" + recv_ldflags="$recv_ldflags $ogg_libs" all_errlist_objs="$all_errlist_objs ogg_afh_common" afh_errlist_objs="$afh_errlist_objs ogg_afh_common" + recv_errlist_objs="$recv_errlist_objs ogg_afh_common" server_errlist_objs="$server_errlist_objs ogg_afh_common" -else - AC_MSG_WARN([vorbis/speex require ogg]) + play_errlist_objs="$play_errlist_objs ogg_afh_common" fi if test "$have_vorbis" = "yes"; then all_errlist_objs="$all_errlist_objs oggdec_filter ogg_afh" @@ -596,15 +735,19 @@ if test "$have_vorbis" = "yes"; then server_ldflags="$server_ldflags $vorbis_libs" filter_ldflags="$filter_ldflags $vorbis_libs" audiod_ldflags="$audiod_ldflags $vorbis_libs" + play_ldflags="$play_ldflags $vorbis_libs" afh_ldflags="$afh_ldflags $vorbis_libs" + recv_ldflags="$recv_ldflags $vorbis_libs" server_errlist_objs="$server_errlist_objs ogg_afh" filter_errlist_objs="$filter_errlist_objs oggdec_filter" audiod_errlist_objs="$audiod_errlist_objs oggdec_filter" + play_errlist_objs="$play_errlist_objs oggdec_filter ogg_afh" afh_errlist_objs="$afh_errlist_objs ogg_afh" + recv_errlist_objs="$recv_errlist_objs ogg_afh" audiod_audio_formats="$audiod_audio_formats ogg" - server_audio_formats="$server_audio_formats ogg" + audio_format_handlers="$audio_format_handlers ogg" else AC_MSG_WARN([no ogg/vorbis $msg]) fi @@ -616,18 +759,46 @@ if test "$have_speex" = "yes"; then server_ldflags="$server_ldflags $speex_libs" filter_ldflags="$filter_ldflags $speex_libs" audiod_ldflags="$audiod_ldflags $speex_libs" + play_ldflags="$play_ldflags $speex_libs" afh_ldflags="$afh_ldflags $speex_libs" + recv_ldflags="$recv_ldflags $speex_libs" server_errlist_objs="$server_errlist_objs spx_afh spx_common" filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common" audiod_errlist_objs="$audiod_errlist_objs spxdec_filter spx_common" + play_errlist_objs="$play_errlist_objs spxdec_filter spx_afh spx_common" afh_errlist_objs="$afh_errlist_objs spx_afh spx_common" + recv_errlist_objs="$recv_errlist_objs spx_afh spx_common" audiod_audio_formats="$audiod_audio_formats spx" - server_audio_formats="$server_audio_formats spx" + audio_format_handlers="$audio_format_handlers spx" else AC_MSG_WARN([no ogg/speex $msg]) fi +if test "$have_opus" = "yes"; then + all_errlist_objs="$all_errlist_objs opusdec_filter opus_afh opus_common" + AC_DEFINE(HAVE_OPUS, 1, define to 1 to turn on ogg/opus support) + filters="$filters opusdec" + opus_libs="-lopus" + server_ldflags="$server_ldflags $opus_libs" + filter_ldflags="$filter_ldflags $opus_libs" + audiod_ldflags="$audiod_ldflags $opus_libs" + afh_ldflags="$afh_ldflags $opus_libs" + play_ldflags="$play_ldflags $opus_libs" + recv_ldflags="$recv_ldflags $opus_libs" + + server_errlist_objs="$server_errlist_objs opus_afh opus_common" + filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common" + audiod_errlist_objs="$audiod_errlist_objs opusdec_filter opus_common" + afh_errlist_objs="$afh_errlist_objs opus_afh opus_common" + play_errlist_objs="$play_errlist_objs opusdec_filter opus_afh opus_common" + recv_errlist_objs="$recv_errlist_objs opus_afh opus_common" + + audiod_audio_formats="$audiod_audio_formats opus" + server_audio_formats="$server_audio_formats opus" +else + AC_MSG_WARN([no ogg/opus $msg]) +fi CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" LIBS="$OLD_LIBS" @@ -636,13 +807,13 @@ have_faad=yes OLD_CPPFLAGS="$CPPFLAGS" OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" -AC_ARG_WITH(faad_headers, [AC_HELP_STRING(--with-faad-headers=dir, +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, [AC_HELP_STRING(--with-faad-libs=dir, +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" @@ -656,13 +827,19 @@ if test "$have_faad" = "yes"; then filter_errlist_objs="$filter_errlist_objs aacdec_filter aac_common" afh_errlist_objs="$afh_errlist_objs aac_common aac_afh" audiod_errlist_objs="$audiod_errlist_objs aacdec_filter aac_common" + play_errlist_objs="$play_errlist_objs aacdec_filter aac_afh aac_common" server_errlist_objs="$server_errlist_objs aac_afh aac_common" + recv_errlist_objs="$recv_errlist_objs aac_afh aac_common" + server_ldflags="$server_ldflags $faad_libs -lfaad" filter_ldflags="$filter_ldflags $faad_libs -lfaad" audiod_ldflags="$audiod_ldflags $faad_libs -lfaad" + play_ldflags="$play_ldflags $faad_libs -lfaad" afh_ldflags="$afh_ldflags $faad_libs -lfaad" + recv_ldflags="$afh_ldflags $faad_libs -lfaad" + audiod_audio_formats="$audiod_audio_formats aac" - server_audio_formats="$server_audio_formats aac" + audio_format_handlers="$audio_format_handlers aac" filters="$filters aacdec" AC_SUBST(faad_cppflags) else @@ -677,13 +854,13 @@ OLD_CPPFLAGS="$CPPFLAGS" OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" -AC_ARG_WITH(mad_headers, [AC_HELP_STRING(--with-mad-headers=dir, +AC_ARG_WITH(mad_headers, [AS_HELP_STRING(--with-mad-headers=dir, [look for mad.h also in dir])]) if test -n "$with_mad_headers"; then mad_cppflags="-I$with_mad_headers" CPPFLAGS="$CPPFLAGS $mad_cppflags" fi -AC_ARG_WITH(mad_libs, [AC_HELP_STRING(--with-mad-libs=dir, +AC_ARG_WITH(mad_libs, [AS_HELP_STRING(--with-mad-libs=dir, [look for libmad also in dir])]) if test -n "$with_mad_libs"; then mad_libs="-L$with_mad_libs" @@ -699,11 +876,14 @@ if test "$have_mad" = "yes"; then AC_DEFINE(HAVE_MAD, 1, define to 1 if you want to build the mp3dec filter) filter_cmdline_objs="$filter_cmdline_objs add_cmdline(mp3dec_filter)" audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(mp3dec_filter)" + play_cmdline_objs="$play_cmdline_objs add_cmdline(mp3dec_filter)" all_errlist_objs="$all_errlist_objs mp3dec_filter" filter_errlist_objs="$filter_errlist_objs mp3dec_filter" audiod_errlist_objs="$audiod_errlist_objs mp3dec_filter" + play_errlist_objs="$play_errlist_objs mp3dec_filter" filter_ldflags="$filter_ldflags $mad_libs -lmad" audiod_ldflags="$audiod_ldflags $mad_libs -lmad" + play_ldflags="$play_ldflags $mad_libs -lmad" audiod_audio_formats="$audiod_audio_formats mp3" filters="$filters mp3dec" AC_SUBST(mad_cppflags) @@ -714,57 +894,87 @@ CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" LIBS="$OLD_LIBS" ###################################################################### libid3tag +OLD_CPPFLAGS="$CPPFLAGS" +OLD_LD_FLAGS="$LDFLAGS" +OLD_LIBS="$LIBS" + +have_libid3tag="yes" +AC_ARG_WITH(id3tag_headers, [AS_HELP_STRING(--with-id3tag-headers=dir, + [look for id3tag header files also in dir])]) +if test -n "$with_id3tag_headers"; then + id3tag_cppflags="-I$with_id3tag_headers" + CPPFLAGS="$CPPFLAGS $id3tag_cppflags" +fi +AC_ARG_WITH(id3tag_libs, [AS_HELP_STRING(--with-id3tag-libs=dir, + [look for id3tag libs also in dir])]) +if test -n "$with_id3tag_libs"; then + id3tag_libs="-L$with_id3tag_libs" + LDFLAGS="$LDFLAGS $id3tag_libs" +fi + AC_MSG_CHECKING(for libid3tag) -AC_TRY_LINK([ +AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #include -],[ +]], [[ struct id3_tag t = {.flags = 0}; -],[have_libid3tag=yes],[have_libid3tag=no]) +]])],[],[have_libid3tag=no]) AC_MSG_RESULT($have_libid3tag) + if test ${have_libid3tag} = yes; then AC_DEFINE(HAVE_LIBID3TAG, 1, define to 1 you have libid3tag) - server_ldflags="$server_ldflags -lid3tag" - afh_ldflags="$afh_ldflags -lid3tag" + server_ldflags="$server_ldflags $id3tag_libs -lid3tag -lz" + afh_ldflags="$afh_ldflags $id3tag_libs -lid3tag -lz" + play_ldflags="$play_ldflags -lz" + recv_ldflags="$recv_ldflags $id3tag_libs -lid3tag" + play_ldflags="$play_ldflags $id3tag_libs -lid3tag" + AC_SUBST(id3tag_cppflags) else AC_MSG_WARN([no support for id3v2 tags]) fi +CPPFLAGS="$OLD_CPPFLAGS" +LDFLAGS="$OLD_LDFLAGS" +LIBS="$OLD_LIBS" ########################################################################### flac OLD_CPPFLAGS="$CPPFLAGS" OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_flac="yes" -AC_ARG_WITH(flac_headers, [AC_HELP_STRING(--with-flac-headers=dir, +AC_ARG_WITH(flac_headers, [AS_HELP_STRING(--with-flac-headers=dir, [look for flac headers also in dir])]) if test -n "$with_flac_headers"; then flac_cppflags="-I$with_flac_headers" CPPFLAGS="$CPPFLAGS $flac_cppflags" fi -AC_ARG_WITH(flac_libs, [AC_HELP_STRING(--with-flac-libs=dir, +AC_ARG_WITH(flac_libs, [AS_HELP_STRING(--with-flac-libs=dir, [look for flac libs also in dir])]) if test -n "$with_flac_libs"; then flac_libs="-L$with_flac_libs" LDFLAGS="$LDFLAGS $flac_libs" fi AC_CHECK_HEADER(FLAC/stream_decoder.h, [], have_flac=no) -AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [], have_flac=no) +AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [], have_flac=no, -logg -lm) if test "$have_flac" = "yes"; then AC_DEFINE(HAVE_FLAC, 1, define to 1 if you want to build the flacdec filter) all_errlist_objs="$all_errlist_objs flacdec_filter flac_afh" filter_errlist_objs="$filter_errlist_objs flacdec_filter" audiod_errlist_objs="$audiod_errlist_objs flacdec_filter" + play_errlist_objs="$play_errlist_objs flacdec_filter flac_afh" afh_errlist_objs="$afh_errlist_objs flac_afh" server_errlist_objs="$server_errlist_objs flac_afh" + recv_errlist_objs="$recv_errlist_objs flac_afh" filter_ldflags="$filter_ldflags $flac_libs -lFLAC" audiod_ldflags="$audiod_ldflags $flac_libs -lFLAC" + play_ldflags="$play_ldflags $flac_libs -lFLAC" server_ldflags="$server_ldflags $flac_libs -lFLAC" afh_ldflags="$afh_ldflags $flac_libs -lFLAC" + recv_ldflags="$afh_ldflags $flac_libs -lFLAC" filters="$filters flacdec" - server_audio_formats="$server_audio_formats flac" + audio_format_handlers="$audio_format_handlers flac" audiod_audio_formats="$audiod_audio_formats flac" AC_SUBST(flac_cppflags) else - AC_MSG_WARN([no flac support in para_audiod/para_filter]) + AC_MSG_WARN([no flac support in para_audiod/para_filter/para_afh/para_server]) fi CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" @@ -775,23 +985,29 @@ OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_oss="yes" -msg="=> will not build para_fade/oss writer" +msg="=> will not build oss writer" AC_CHECK_HEADER(sys/soundcard.h, [ - extras="$extras fade" - executables="$executables fade" - all_errlist_objs="$all_errlist_objs oss_write" audiod_errlist_objs="$audiod_errlist_objs oss_write" + play_errlist_objs="$play_errlist_objs oss_write" audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(oss_write)" + play_cmdline_objs="$play_cmdline_objs add_cmdline(oss_write)" write_errlist_objs="$write_errlist_objs oss_write" write_cmdline_objs="$write_cmdline_objs add_cmdline(oss_write)" + fade_errlist_objs="$fade_errlist_objs oss_mix" + all_errlist_objs="$all_errlist_objs oss_write oss_mix" + writers="$writers oss" default_writer="OSS_WRITE" + mixers="${mixers}oss " + default_mixer="OSS_MIX" + AC_CHECK_LIB(ossaudio, _oss_ioctl, [ audiod_ldflags="$audiod_ldflags -lossaudio" + play_ldflags="$play_ldflags -lossaudio" write_ldflags="$write_ldflags -lossaudio" - fade_ldflags="$write_ldflags -lossaudio" + fade_ldflags="$fade_ldflags -lossaudio" ] ) ], @@ -830,34 +1046,80 @@ if test "$have_alsa" = "yes"; then fi if test "$have_alsa" = "yes"; then - all_errlist_objs="$all_errlist_objs alsa_write" audiod_errlist_objs="$audiod_errlist_objs alsa_write" audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(alsa_write)" audiod_ldflags="$audiod_ldflags -lasound" + play_errlist_objs="$play_errlist_objs alsa_write" + play_cmdline_objs="$play_cmdline_objs add_cmdline(alsa_write)" + play_ldflags="$play_ldflags -lasound" write_errlist_objs="$write_errlist_objs alsa_write" write_cmdline_objs="$write_cmdline_objs add_cmdline(alsa_write)" write_ldflags="$write_ldflags -lasound" + fade_errlist_objs="$fade_errlist_objs alsa_mix" + fade_ldflags="$fade_ldflags -lasound" + all_errlist_objs="$all_errlist_objs alsa_write alsa_mix" + writers="$writers alsa" default_writer="ALSA_WRITE" + mixers="${mixers}alsa " + default_mixer="ALSA_MIX" fi CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" LIBS="$OLD_LIBS" +########################################################################### fade +if test -n "$mixers"; then + extras="$extras fade" + executables="$executables fade" + all_errlist_objs="$all_errlist_objs fade" + fade_errlist_objs="$fade_errlist_objs fade exec string fd version ggo" + fade_cmdline_objs="add_cmdline(fade)" + fade_objs="$fade_cmdline_objs $fade_errlist_objs" + AC_SUBST(fade_objs, add_dot_o($fade_objs)) + AC_SUBST(fade_ldflags, $fade_ldflags) + 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_summary="supported mixers:: $mixers, default: $default_mixer" +else + AC_MSG_WARN([no mixer support]) + mixer_summary="para_fade: no" +fi ########################################################################### libao OLD_CPPFLAGS="$CPPFLAGS" OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_ao="yes" -AC_ARG_WITH(ao_headers, [AC_HELP_STRING(--with-ao-headers=dir, +AC_ARG_WITH(ao_headers, [AS_HELP_STRING(--with-ao-headers=dir, [look for ao/ao.h also in dir])]) if test -n "$with_ao_headers"; then ao_cppflags="-I$with_ao_headers" CPPFLAGS="$CPPFLAGS $ao_cppflags" fi -AC_ARG_WITH(ao_libs, [AC_HELP_STRING(--with-ao-libs=dir, +AC_ARG_WITH(ao_libs, [AS_HELP_STRING(--with-ao-libs=dir, [look for libao also in dir])]) if test -n "$with_ao_libs"; then ao_libs="-L$with_ao_libs" @@ -894,6 +1156,10 @@ if test "$have_ao" = "yes"; then audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(ao_write)" audiod_ldflags="$audiod_ldflags -lao -lpthread" + play_errlist_objs="$play_errlist_objs ao_write" + play_cmdline_objs="$play_cmdline_objs add_cmdline(ao_write)" + play_ldflags="$play_ldflags -lao -lpthread" + write_errlist_objs="$write_errlist_objs ao_write" write_cmdline_objs="$write_cmdline_objs add_cmdline(ao_write)" write_ldflags="$write_ldflags $ao_libs -lao -lpthread" @@ -910,14 +1176,14 @@ OLD_LD_FLAGS="$LDFLAGS" OLD_LIBS="$LIBS" have_readline="yes" -AC_ARG_WITH(readline_headers, [AC_HELP_STRING(--with-readline-headers=dir, +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, [AC_HELP_STRING(--with-readline-libs=dir, +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" @@ -929,14 +1195,21 @@ AC_CHECK_HEADERS([readline/readline.h], [ have_readline="no" AC_MSG_WARN([readline/readline.h not found, $msg]) ]) + +if test "$have_curses" != "yes"; then + have_readline="no" + AC_MSG_WARN([interactive cli support depends on curses,]) + AC_MSG_WARN([but no curses lib was detected, $msg]) +fi + if test "$have_readline" = "yes"; then readline_libs="$readline_libs -lreadline" - AC_SEARCH_LIBS([rl_replace_line], [readline], [], [have_readline="no"]) + AC_SEARCH_LIBS([rl_free_keymap], [readline], [], [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_replace_line 2> /dev/null - AC_SEARCH_LIBS([rl_replace_line], [readline], [ + unset ac_cv_search_rl_free_keymap 2> /dev/null + AC_SEARCH_LIBS([rl_free_keymap], [readline], [ have_readline=yes readline_libs="$readline_libs -lcurses" ], [], [-lcurses]) @@ -944,8 +1217,8 @@ if test "$have_readline" = "yes"; then if test "$have_readline" = "no"; then # try with -ltermcap # clear cache AC_MSG_NOTICE([trying again with -ltermcap]) - unset ac_cv_search_rl_replace_line 2> /dev/null - AC_SEARCH_LIBS([rl_replace_line], [readline], [ + unset ac_cv_search_rl_free_keymap 2> /dev/null + AC_SEARCH_LIBS([rl_free_keymap], [readline], [ have_readline=yes readline_libs="$readline_libs -ltermcap" ], [], [-ltermcap]) @@ -958,6 +1231,8 @@ if test "$have_readline" = "yes"; then client_ldflags="$client_ldflags $readline_libs" audioc_errlist_objs="$audioc_errlist_objs buffer_tree interactive sched time" audioc_ldflags="$audioc_ldflags $readline_libs" + play_errlist_objs="$play_errlist_objs interactive" + play_ldflags="$play_ldflags $readline_libs" AC_SUBST(readline_cppflags) AC_DEFINE(HAVE_READLINE, 1, define to 1 to turn on readline support) else @@ -966,16 +1241,47 @@ fi CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" LIBS="$OLD_LIBS" -############################################################# - - -AC_SUBST(install_sh, [$INSTALL]) -AC_CONFIG_FILES([Makefile]) +############################################################# libsamplerate +OLD_CPPFLAGS="$CPPFLAGS" +OLD_LD_FLAGS="$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_DEFUN([add_dot_o],[$(for i in $@; do printf "$i.o "; done)]) -AC_DEFUN([add_para],[$(for i in $@; do printf "para_$i "; done)]) -AC_DEFUN([objlist_to_errlist],[$(for i in $@; do printf "DEFINE_ERRLIST($(echo $i| tr 'a-z' 'A-Z'));"; done) [const char **para_errlist[[]]] = {$(for i in $@; do printf "PARA_ERRLIST($(echo $i | tr 'a-z' 'A-Z')), "; done) }]) +AC_CHECK_HEADER(samplerate.h, [], have_samplerate=no) +AC_CHECK_LIB([samplerate], [src_process], [], have_samplerate=no, []) + +if test "$have_samplerate" = "yes"; then + all_errlist_objs="$all_errlist_objs resample_filter" + filter_errlist_objs="$filter_errlist_objs resample_filter check_wav" + filter_cmdline_objs="$filter_cmdline_objs add_cmdline(resample_filter)" + audiod_errlist_objs="$audiod_errlist_objs resample_filter check_wav" + audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(resample_filter)" + play_errlist_objs="$play_errlist_objs resample_filter check_wav" + play_cmdline_objs="$play_cmdline_objs add_cmdline(resample_filter)" + filter_ldflags="$filter_ldflags $samplerate_libs -lsamplerate" + audiod_ldflags="$audiod_ldflags $samplerate_libs -lsamplerate" + play_ldflags="$play_ldflags $samplerate_libs -lsamplerate" + filters="$filters resample" + AC_SUBST(samplerate_cppflags) +else + AC_MSG_WARN([no resample support in para_audiod/para_filter]) +fi +CPPFLAGS="$OLD_CPPFLAGS" +LDFLAGS="$OLD_LDFLAGS" +LIBS="$OLD_LIBS" ############################################################# error2.h AC_MSG_NOTICE(creating error2.h) for i in $executables; do @@ -1014,10 +1320,10 @@ done AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [$result], [char * array of all status items]) -AC_DEFINE_UNQUOTED(SERVER_AUDIO_FORMATS, "$server_audio_formats", +AC_DEFINE_UNQUOTED(AUDIO_FORMAT_HANDLERS, "$audio_format_handlers", [formats supported by para_server and para_afh]) -AC_SUBST(executables, add_para($executables)) +AC_SUBST(executables) recv_objs="$recv_cmdline_objs $recv_errlist_objs" filter_objs="$filter_cmdline_objs $filter_errlist_objs" @@ -1027,7 +1333,8 @@ write_objs="$write_cmdline_objs $write_errlist_objs" client_objs="$client_cmdline_objs $client_errlist_objs" audioc_objs="$audioc_cmdline_objs $audioc_errlist_objs" afh_objs="$afh_cmdline_objs $afh_errlist_objs" -fade_objs="$fade_cmdline_objs $fade_errlist_objs" +play_objs="$play_cmdline_objs $play_errlist_objs" + AC_SUBST(recv_objs, add_dot_o($recv_objs)) AC_SUBST(recv_ldflags, $recv_ldflags) @@ -1070,14 +1377,14 @@ AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS, objlist_to_errlist($audioc_errlist_objs), errors used by para_audioc) AC_SUBST(gui_objs, add_dot_o($gui_objs)) +AC_SUBST(gui_ldflags, $gui_ldflags) AC_DEFINE_UNQUOTED(INIT_GUI_ERRLISTS, objlist_to_errlist($gui_errlist_objs), errors used by para_gui) -AC_SUBST(fade_objs, add_dot_o($fade_objs)) -AC_SUBST(fade_ldflags, $fade_ldflags) -AC_DEFINE_UNQUOTED(INIT_FADE_ERRLISTS, - objlist_to_errlist($fade_errlist_objs), errors used by para_fade) - +AC_SUBST(play_objs, add_dot_o($play_objs)) +AC_SUBST(play_ldflags, $play_ldflags) +AC_DEFINE_UNQUOTED(INIT_PLAY_ERRLISTS, + objlist_to_errlist($play_errlist_objs), errors used by para_play) enum="$(for i in $filters; do printf "${i}_FILTER, " | tr '[a-z]' '[A-Z]'; done)" AC_DEFINE_UNQUOTED(FILTER_ENUM, $enum NUM_SUPPORTED_FILTERS, @@ -1110,9 +1417,10 @@ paraslash configuration: ~~~~~~~~~~~~~~~~~~~~~~~~ unix socket credentials: $have_ucred readline (interactive CLIs): $have_readline -audio formats supported by para_server/para_afh: $server_audio_formats +audio formats handlers: $audio_format_handlers id3 version2 support: $have_libid3tag -filters supported by para_audiod/para_filter: $filters -writers supported by para_audiod/para_write: $writers +filters: $filters +writers: $writers optional executables: $extras +$mixer_summary ])