X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=fdc0b7ce5f286f9a6b976334a2589d5fe7613b18;hp=d7d30554985a5b40fc117634a4d74941d6e008af;hb=b6100d88b5a03e824991b4a5bfd90b0e951e8d2b;hpb=92ac8f15dac214cc1b8f9e16288646068cac6432

diff --git a/configure.ac b/configure.ac
index d7d30554..fdc0b7ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 AC_PREREQ(2.60)
 
 
-AC_INIT(paraslash, [0.3.4], maan@systemlinux.org)
+AC_INIT(paraslash, [git], maan@systemlinux.org)
 AC_CONFIG_HEADER([config.h])
 
 AC_PATH_PROG(UNAMEPATH, uname, no)
@@ -80,13 +80,13 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
 
 all_errlist_objs="server mp3_afh afh_common vss command net string signal time
 daemon stat crypt http_send close_on_fork ipc acl afh fade amp_filter
-dccp_send fd user_list chunk_queue afs osl aft mood score attribute blob ringbuffer
-playlist sha1 rbtree sched audiod grab_client filter_common wav_filter compress_filter
+dccp_send fd user_list chunk_queue afs aft mood score attribute blob ringbuffer
+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 fsck exec send_common ggo
-udp_recv udp_send color fec fecdec_filter"
+client_common recv stdout filter stdin audioc write client exec send_common ggo
+udp_recv udp_send color fec fecdec_filter prebuffer_filter"
 
-all_executables="server recv filter audioc write client fsck afh"
+all_executables="server recv filter audioc write client afh"
 
 recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline udp_recv.cmdline"
 recv_errlist_objs="http_recv recv_common recv time string net dccp_recv
@@ -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 sha1"
 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=""
 
@@ -122,10 +125,10 @@ afh_ldflags=""
 
 server_cmdline_objs="server.cmdline server_command_list afs_command_list"
 server_errlist_objs="server afh_common mp3_afh vss command net string signal
-	time daemon stat crypt http_send close_on_fork
-	ipc dccp_send fd user_list chunk_queue afs osl aft mood score attribute
-	blob playlist sha1 rbtree sched acl send_common udp_send color fec"
-server_ldflags=""
+	time daemon crypt http_send close_on_fork
+	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_ldflags="-losl"
 server_audio_formats=" mp3"
 
 write_cmdline_objs="write.cmdline file_write.cmdline"
@@ -135,12 +138,10 @@ writers=" file"
 default_writer="FILE_WRITE"
 
 client_cmdline_objs="client.cmdline"
-client_errlist_objs="client net string crypt fd sched stdin stdout client_common"
+client_errlist_objs="client net string crypt fd sched stdin stdout
+	client_common sha1"
 client_ldflags=""
 
-fsck_cmdline_objs="fsck.cmdline"
-fsck_errlist_objs="osl rbtree fsck string sha1 fd"
-
 gui_cmdline_objs="gui.cmdline"
 gui_errlist_objs="exec signal string stat ringbuffer fd"
 gui_other_objs="gui gui_theme"
@@ -150,7 +151,17 @@ fade_cmdline_objs="fade.cmdline"
 fade_errlist_objs="fade exec string fd"
 
 
-
+########################################################################### osl
+have_osl=yes
+AC_CHECK_HEADER(osl.h, [], have_osl=no)
+AC_CHECK_LIB([osl], [osl_open_table], [], have_osl=no)
+if test "$have_osl" = "no"; then
+	AC_MSG_ERROR([libosl not found, type the following to download:
+	git clone git://git.tuebingen.mpg.de/osl
+Install the library with
+	(cd osl && make && sudo make install)
+	])
+fi
 ########################################################################### ssl
 dnl @synopsis CHECK_SSL
 dnl
@@ -190,10 +201,9 @@ AC_ARG_ENABLE(ssldir, [AS_HELP_STRING(--enable-ssldir=path,
 	[Search for openssl also in path.])])
 if test "$enable_ssldir" = "yes"; then enable_ssldir=""; fi
 CHECK_SSL($enable_ssldir)
-server_ldflags="$srver_ldflags $SSL_LDFLAGS $SSL_LIBS"
+server_ldflags="$server_ldflags $SSL_LDFLAGS $SSL_LIBS"
 client_ldflags="$client_ldflags $SSL_LDFLAGS $SSL_LIBS"
 audiod_ldflags="$audiod_ldflags $SSL_LDFLAGS $SSL_LIBS"
-fsck_ldflags="$fsck_ldflags $SSL_LDFLAGS $SSL_LIBS"
 
 ########################################################################### libsocket
 AC_CHECK_LIB([c], [socket],
@@ -467,27 +477,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 +549,7 @@ if test "$have_alsa" = "yes"; then
 	writers="$writers alsa"
 	default_writer="ALSA_WRITE"
 fi
+
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
@@ -584,11 +620,12 @@ AC_DEFINE_UNQUOTED(DEFINE_ERRLIST_OBJECT_ENUM,
 ################################################################## status items
 
 status_items="basename status num_played mtime bitrate frequency file_size
-status_flags format score audio_file_info taginfo1 taginfo2 afs_mode
+status_flags format score techinfo afs_mode
 attributes_txt decoder_flags audiod_status play_time attributes_bitmap
 offset seconds_total stream_start current_time audiod_uptime image_id
 lyrics_id duration directory lyrics_name image_name path hash channels
-last_played num_chunks chunk_time amplification"
+last_played num_chunks chunk_time amplification artist title year album
+comment"
 
 # $1: prefix, $2: items
 AC_DEFUN([make_enum_items], [$(
@@ -620,7 +657,6 @@ audiod_objs="$audiod_cmdline_objs $audiod_errlist_objs"
 server_objs="$server_cmdline_objs $server_errlist_objs"
 write_objs="$write_cmdline_objs $write_errlist_objs"
 client_objs="$client_cmdline_objs $client_errlist_objs"
-fsck_objs="$fsck_cmdline_objs $fsck_errlist_objs"
 audioc_objs="$audioc_cmdline_objs $audioc_errlist_objs"
 afh_objs="$afh_cmdline_objs $afh_errlist_objs"
 fade_objs="$fade_cmdline_objs $fade_errlist_objs"
@@ -660,11 +696,6 @@ AC_SUBST(client_ldflags, $client_ldflags)
 AC_DEFINE_UNQUOTED(INIT_CLIENT_ERRLISTS,
 	objlist_to_errlist($client_errlist_objs), errors used by para_client)
 
-AC_SUBST(fsck_objs, add_dot_o($fsck_objs))
-AC_SUBST(fsck_ldflags, $fsck_ldflags)
-AC_DEFINE_UNQUOTED(INIT_FSCK_ERRLISTS,
-	objlist_to_errlist($fsck_errlist_objs), errors used by para_fsck)
-
 AC_SUBST(audioc_objs, add_dot_o($audioc_objs))
 AC_SUBST(audioc_ldflags, $audioc_ldflags)
 AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS,
@@ -675,6 +706,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)