X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=configure.ac;h=2ff271b33fd1026c3a4cfe026e49d63b03652cf8;hb=170ccb94f747a71d9da7541032a5aca8f26e58a0;hp=aadaee34f8ee150283bb013c9302fe5a1ce39e1d;hpb=620c2a3eb4c3395c5be73f663435740ecd878775;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index aadaee34..2ff271b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,16 +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 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"
+all_executables="server recv filter audioc write client afh audiod"
 
 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,8 +121,8 @@ 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=""
+	bitstream imdct wma_common wmadec_filter buffer_tree"
+audiod_ldflags="-lm"
 audiod_audio_formats="wma"
 
 afh_cmdline_objs="add_cmdline(afh)"
@@ -136,17 +136,18 @@ server_errlist_objs="server afh_common mp3_afh vss command net string signal
 	blob playlist sha1 sched acl send_common udp_send color fec
 	server_command_list afs_command_list wma_afh wma_common"
 server_ldflags="-losl"
-server_audio_formats=" mp3"
+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 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_errlist_objs="client net string crypt fd sched stdin stdout time
+	client_common sha1 buffer_tree"
 client_ldflags=""
 
 gui_cmdline_objs="add_cmdline(gui)"
@@ -481,12 +482,6 @@ if test "$have_mad" = "yes"; then
 else
 	AC_MSG_WARN([no mp3dec support in para_audiod/para_filter])
 fi
-if test -n "$audiod_audio_formats"; then
-	extras="$extras para_audiod"
-	all_executables="$all_executables audiod"
-else
-	AC_MSG_WARN([can not build para_audiod (no supported audio formats)])
-fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"