X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=85a327297042c4430721c707be7f0ba3adcd7215;hp=da5ec770802ec1a0fa0410141b3d96f8017440d0;hb=69f80c03033d65a530aa0f29cc7238185e7300cf;hpb=318fbe90e08b6d9c5e781d9b517b670c5a1a04d7

diff --git a/configure.ac b/configure.ac
index da5ec770..85a32729 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,7 +84,7 @@ dccp_send fd user_list chunk_queue afs osl aft mood score attribute blob ringbuf
 playlist sha1 rbtree 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 fsck exec send_common ggo
-udp_recv udp_send color fec fecdec_filter"
+udp_recv udp_send color fec fecdec_filter prebuffer_filter"
 
 all_executables="server recv filter audioc write client fsck afh"
 
@@ -96,11 +96,13 @@ recv_ldflags=""
 receivers=" http dccp udp"
 senders=" http dccp udp"
 
-filter_cmdline_objs="filter.cmdline compress_filter.cmdline amp_filter.cmdline"
+filter_cmdline_objs="filter.cmdline compress_filter.cmdline amp_filter.cmdline
+	prebuffer_filter.cmdline"
 filter_errlist_objs="filter_common wav_filter compress_filter filter string
-	stdin stdout sched fd amp_filter ggo fecdec_filter fec"
+	stdin stdout sched fd amp_filter ggo fecdec_filter fec
+	prebuffer_filter time"
 filter_ldflags=""
-filters=" compress wav amp fecdec"
+filters=" compress wav amp fecdec prebuffer"
 
 audioc_cmdline_objs="audioc.cmdline"
 audioc_errlist_objs="audioc string net fd"
@@ -108,11 +110,12 @@ audioc_ldflags=""
 
 audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline
 	http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline
-	audiod_command_list amp_filter.cmdline udp_recv.cmdline"
+	audiod_command_list amp_filter.cmdline udp_recv.cmdline
+	prebuffer_filter.cmdline"
 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"
+	client_common ggo udp_recv color fec prebuffer_filter"
 audiod_ldflags=""
 audiod_audio_formats=""
 
@@ -467,27 +470,52 @@ if test ${have_libid3tag} = yes; then
 else
 	AC_MSG_WARN([no support for id3v2 tags])
 fi
+########################################################################### oss
+OLD_CPPFLAGS="$CPPFLAGS"
+OLD_LD_FLAGS="$LDFLAGS"
+OLD_LIBS="$LIBS"
+
+have_oss="yes"
+msg="=> will not build para_fade/oss writer"
+
+AC_CHECK_HEADER(sys/soundcard.h, [
+	extras="$extras para_fade"
+	all_executables="$all_executables fade"
+	all_errlist_objs="$all_errlist_objs oss_write"
+	audiod_errlist_objs="$audiod_errlist_objs oss_write"
+	audiod_cmdline_objs="$audiod_cmdline_objs oss_write.cmdline"
+
+	write_errlist_objs="$write_errlist_objs oss_write"
+	write_cmdline_objs="$write_cmdline_objs oss_write.cmdline"
+	writers="$writers oss"
+	default_writer="OSS_WRITE"
+	AC_CHECK_LIB(ossaudio, _oss_ioctl, [
+			audiod_ldflags="$audiod_ldflags -lossaudio"
+			write_ldflags="$write_ldflags -lossaudio"
+			fade_ldflags="$write_ldflags -lossaudio"
+		]
+	)
+	],
+	[
+		have_oss="no"
+		AC_MSG_WARN([no linux/soundcard.h $msg])
+	]
+)
+CPPFLAGS="$OLD_CPPFLAGS"
+LDFLAGS="$OLD_LDFLAGS"
+LIBS="$OLD_LIBS"
+
 ########################################################################### alsa
-have_alsa="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
 OLD_LD_FLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
+
+msg="=> no alsa support for para_audiod/para_write"
 if test "$OSTYPE" != "Linux"; then
 	have_alsa="no"
+else
+	have_alsa="yes"
 fi
-msg="=> will not build para_fade"
-if test "$have_alsa" = "yes"; then
-	AC_CHECK_HEADER(linux/soundcard.h, [
-		extras="$extras para_fade"
-		all_executables="$all_executables fade"
-		],
-		[
-			have_alsa="no"
-			AC_MSG_WARN([no linux/soundcard.h $msg])
-		]
-	)
-fi
-msg="=> no alsa support for para_audiod/para_write"
 if test "$have_alsa" = "yes"; then
 	AC_CHECK_HEADERS([alsa/asoundlib.h], [], [
 		have_alsa="no"
@@ -514,6 +542,7 @@ if test "$have_alsa" = "yes"; then
 	writers="$writers alsa"
 	default_writer="ALSA_WRITE"
 fi
+
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
@@ -675,6 +704,7 @@ AC_DEFINE_UNQUOTED(INIT_GUI_ERRLISTS,
 	objlist_to_errlist($gui_errlist_objs), errors used by para_gui)
 
 AC_SUBST(fade_objs, add_dot_o($fade_objs))
+AC_SUBST(fade_ldflags, $fade_ldflags)
 AC_DEFINE_UNQUOTED(INIT_FADE_ERRLISTS,
 	objlist_to_errlist($fade_errlist_objs), errors used by para_fade)