X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=61421b5d111e6f8612deb7ad5528cfd91a9e91d7;hp=78b378638c2cd8d142de250d104962d83a8fe867;hb=8b0ab0837ecdd5d28c7b6f31a605552f6942ca64;hpb=b2e6a24448a9e49e0766ab4f32163580eeff469e;ds=inline

diff --git a/configure.ac b/configure.ac
index 78b37863..61421b5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,10 +108,10 @@ audioc_cmdline_objs="audioc.cmdline"
 audioc_errlist_objs="audioc string net fd"
 audioc_ldflags=""
 
-audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline
+audiod_cmdline_objs="audiod.cmdline compress_filter.cmdline
 	http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline
 	audiod_command_list amp_filter.cmdline udp_recv.cmdline
-	prebuffer_filter.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
@@ -125,7 +125,7 @@ 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
+	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"
@@ -138,7 +138,8 @@ 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=""
 
 gui_cmdline_objs="gui.cmdline"
@@ -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
@@ -609,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], [$(