X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=aa62ebc7f697c2bec6ee2fae01799b4ad2b55997;hp=4583b1eb3fb5dfb251496bb15f6c70463009ad23;hb=1e012cf40238883621692051a22fb9c7cad5e944;hpb=226ce82aaccff7e74a6fadd028743b731a3744d2 diff --git a/configure.ac b/configure.ac index 4583b1eb..aa62ebc7 100644 --- a/configure.ac +++ b/configure.ac @@ -90,8 +90,8 @@ playlist sha1 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 mdct wma_afh -wma_common wmadec_filter +server_command_list afs_command_list audiod_command_list bitstream imdct wma_afh +wma_common wmadec_filter buffer_tree " all_executables="server recv filter audioc write client afh" @@ -99,7 +99,7 @@ all_executables="server recv filter audioc write client afh" 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 fec" + fd sched stdout ggo udp_recv fec buffer_tree" recv_ldflags="" receivers=" http dccp udp" @@ -108,7 +108,7 @@ senders=" http dccp udp" 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 - prebuffer_filter time bitstream mdct wma_common wmadec_filter" + prebuffer_filter time bitstream imdct wma_common wmadec_filter buffer_tree" filter_ldflags="-lm" filters=" compress wav amp fecdec wmadec prebuffer" @@ -121,9 +121,9 @@ audiod_errlist_objs="audiod signal string daemon stat net 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 crypt fecdec_filter client_common ggo udp_recv color fec prebuffer_filter sha1 audiod_command_list - bitstream mdct wma_common wmadec_filter" -audiod_ldflags="" -audiod_audio_formats="" + 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" @@ -139,14 +139,15 @@ server_ldflags="-losl" server_audio_formats=" mp3" write_cmdline_objs="add_cmdline(write file_write)" -write_errlist_objs="write write_common file_write time fd string sched stdin ggo" +write_errlist_objs="write write_common file_write time fd string sched stdin + buffer_tree ggo" write_ldflags="" writers=" file" default_writer="FILE_WRITE" client_cmdline_objs="add_cmdline(client)" client_errlist_objs="client net string crypt fd sched stdin stdout - client_common sha1" + client_common sha1 buffer_tree" client_ldflags="" gui_cmdline_objs="add_cmdline(gui)" @@ -390,7 +391,7 @@ if test "$have_ogg" = "yes"; then audiod_errlist_objs="$audiod_errlist_objs oggdec_filter" afh_errlist_objs="$afh_errlist_objs ogg_afh" - audiod_audio_formats="ogg" + audiod_audio_formats="$audiod_audio_formats ogg" server_audio_formats="$server_audio_formats ogg" AC_SUBST(oggvorbis_cppflags) AC_SUBST(oggvorbis_libs)