X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=da9c5dbcc928a650fe4ebe9c9b0447e070d712d9;hp=4cb283d26092ca87923162e86a9655d4f0993be5;hb=ee891eaa8db760321faeabc5294438d7a5df262d;hpb=2239be1b3bfb2e8af9f855a6cda61b92d7b22fef

diff --git a/configure.ac b/configure.ac
index 4cb283d2..da9c5dbc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,7 +80,7 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
 
 cmdline_dir="cmdline"
 AC_SUBST(cmdline_dir)
-AC_DEFUN([add_cmdline],[$(for i in $@; do printf "${cmdline_dir}/${i}.cmdline "; done)])
+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
@@ -90,7 +90,9 @@ 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
+"
 
 all_executables="server recv filter audioc write client afh"
 
@@ -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"
+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"
+	client_common ggo udp_recv color fec prebuffer_filter sha1 audiod_command_list
+	bitstream imdct wma_common wmadec_filter"
 audiod_ldflags=""
-audiod_audio_formats=""
+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,7 +134,7 @@ 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"
 
@@ -387,7 +390,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)
@@ -530,7 +533,7 @@ AC_CHECK_HEADER(sys/soundcard.h, [
 	],
 	[
 		have_oss="no"
-		AC_MSG_WARN([no linux/soundcard.h $msg])
+		AC_MSG_WARN([no sys/soundcard.h $msg])
 	]
 )
 CPPFLAGS="$OLD_CPPFLAGS"