Don't include osl.h from the audio format handlers.

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3e4239094b128c0913ce48ba93e207fff0bc59a0..5f39c24549796c22a125d58e14fe331afc654986 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -84,7 +84,7 @@ 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 exec send_common ggo
-udp_recv udp_send color fec fecdec_filter prebuffer_filter"
+udp_recv udp_send color fec fecdec_filter prebuffer_filter mm"
 
 all_executables="server recv filter audioc write client afh"
 
@@ -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 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_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