X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=aa62ebc7f697c2bec6ee2fae01799b4ad2b55997;hp=2989189da1f560a7848bb7cecfe623ad94b6aec0;hb=3bb5d9c5f7e30c5b4d2216171ee9aff1389d70ae;hpb=a4eb244ecdf9aaa0f167b3c91d3e276bde99d681;ds=sidebyside

diff --git a/configure.ac b/configure.ac
index 2989189d..aa62ebc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,14 +90,16 @@ 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"
+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"
 
 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"
@@ -106,9 +108,9 @@ 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"
-filter_ldflags=""
-filters=" compress wav amp fecdec prebuffer"
+	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"
@@ -118,12 +120,13 @@ audiod_cmdline_objs="add_cmdline(audiod compress_filter http_recv dccp_recv file
 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"
-audiod_ldflags=""
-audiod_audio_formats=""
+	client_common ggo udp_recv color fec prebuffer_filter sha1 audiod_command_list
+	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"
+afh_errlist_objs="afh string fd mp3_afh afh_common time wma_afh wma_common"
 afh_ldflags=""
 
 server_cmdline_objs="add_cmdline(server)"
@@ -131,19 +134,20 @@ server_errlist_objs="server afh_common mp3_afh vss command net string signal
 	time daemon crypt http_send close_on_fork mm
 	ipc dccp_send fd user_list chunk_queue afs aft mood score attribute
 	blob playlist sha1 sched acl send_common udp_send color fec
-	server_command_list afs_command_list"
+	server_command_list afs_command_list wma_afh wma_common"
 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)"
@@ -387,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)