X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=7c2c1ec56b0180fe1cbe66279f6fe738fc66964a;hp=91cd28425e78e81fe88d4d1486bdf94ff32d48e2;hb=081e022105bbfd6c1e56730200919f276b1ff630;hpb=5a506c5917569033b95d36f6425ec7f54e7d022a

diff --git a/configure.ac b/configure.ac
index 91cd2842..7c2c1ec5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,27 +57,28 @@ AC_CHECK_LIB([menu], [new_menu], [extras="$extras para_dbadm"],
 
 recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline"
 recv_errlist_objs="http_recv recv_common recv time string net dccp_recv
-	dccp fd"
+	dccp fd sched stdout"
 recv_ldflags=""
 
 filter_cmdline_objs="filter.cmdline compress_filter.cmdline"
-filter_errlist_objs="filter_chain wav compress filter string"
+filter_errlist_objs="filter_chain wav compress filter string stdin stdout sched fd"
 filter_ldflags=""
 
 audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline
-	http_recv.cmdline dccp_recv.cmdline"
+	http_recv.cmdline dccp_recv.cmdline file_write.cmdline"
 audiod_errlist_objs="audiod exec close_on_fork signal string daemon stat net
-	time grab_client filter_chain wav compress http_recv dccp dccp_recv recv_common fd"
+	time grab_client filter_chain wav compress http_recv dccp dccp_recv
+	recv_common fd sched write_common file_writer"
 audiod_ldflags=""
 
 server_cmdline_objs="server.cmdline"
-server_errlist_objs="server mp3 afs command net string signal random_selector
+server_errlist_objs="server mp3_afh afs command net string signal random_selector
 	time daemon stat crypt http_send db close_on_fork playlist_selector
 	ipc dccp dccp_send fd"
 server_ldflags=""
 
-write_cmdline_objs="write.cmdline"
-write_errlist_objs="write write_common file_writer time fd string"
+write_cmdline_objs="write.cmdline file_write.cmdline"
+write_errlist_objs="write write_common file_writer time fd string sched stdin"
 write_ldflags=""
 write_writers="file"
 
@@ -209,7 +210,7 @@ if test "$have_ogg" = "yes"; then
 	filter_cmdline_objs="$filter_cmdline_objs oggdec_filter.cmdline"
 	audiod_cmdline_objs="$audiod_cmdline_objs oggdec_filter.cmdline"
 
-	server_errlist_objs="$server_errlist_objs ogg"
+	server_errlist_objs="$server_errlist_objs ogg_afh"
 	filter_errlist_objs="$filter_errlist_objs oggdec"
 	audiod_errlist_objs="$audiod_errlist_objs oggdec"
 else
@@ -233,8 +234,10 @@ AC_CHECK_HEADER(neaacdec.h, [], have_faad=no)
 AC_CHECK_LIB([faad], [NeAACDecOpen], [], have_faad=no)
 if test "$have_faad" = "yes"; then
 	AC_DEFINE(HAVE_FAAD, 1, define to 1 if you want to build the aacdec filter)
-	filter_errlist_objs="$filter_errlist_objs aacdec"
-	audiod_errlist_objs="$audiod_errlist_objs aacdec"
+	filter_errlist_objs="$filter_errlist_objs aacdec aac_common"
+	audiod_errlist_objs="$audiod_errlist_objs aacdec aac_common"
+	server_errlist_objs="$server_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"
 	AC_SUBST(faad_cppflags)
@@ -261,7 +264,7 @@ else
 fi
 ########################################################################### alsa
 have_alsa="yes"
-msg="=> no alsa support for para_write"
+msg="=> no alsa support for para_audiod/para_write"
 AC_CHECK_HEADERS([alsa/asoundlib.h], [], [
 	AC_MSG_WARN([no alsa/asoundlib $msg])
 	have_alsa="no"
@@ -271,7 +274,12 @@ AC_CHECK_LIB([asound], [snd_pcm_open], [], [
 	have_alsa="no"
 ])
 if test "$have_alsa" = "yes"; then
+	audiod_errlist_objs="$audiod_errlist_objs alsa_writer"
+	audiod_cmdline_objs="$audiod_cmdline_objs alsa_write.cmdline"
+	audiod_ldflags="$audiod_ldflags -lasound"
+
 	write_errlist_objs="$write_errlist_objs alsa_writer"
+	write_cmdline_objs="$write_cmdline_objs alsa_write.cmdline"
 	write_ldflags="$write_ldflags -lasound"
 	write_writers="$write_writers alsa"
 fi