X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=e28bce30aa3e11c3aafa4484cea6ec291e93ac73;hp=fdc0b7ce5f286f9a6b976334a2589d5fe7613b18;hb=bb6721e17e741b7ea52fbf88661d2b177bed72c3;hpb=03d45daad787b8f2ced3070e80c4550bf4b02931

diff --git a/configure.ac b/configure.ac
index fdc0b7ce..e28bce30 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
 AC_PREREQ(2.60)
 
 
-AC_INIT(paraslash, [git], maan@systemlinux.org)
+AC_INIT(paraslash, [0.3.5], maan@systemlinux.org)
 AC_CONFIG_HEADER([config.h])
 
 AC_PATH_PROG(UNAMEPATH, uname, no)
@@ -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,7 +108,7 @@ 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 sha1"
@@ -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 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"
@@ -153,15 +153,36 @@ fade_errlist_objs="fade exec string fd"
 
 ########################################################################### osl
 have_osl=yes
+OLD_CPPFLAGS="$CPPFLAGS"
+OLD_LD_FLAGS="$LDFLAGS"
+OLD_LIBS="$LIBS"
+AC_ARG_WITH(osl_headers, [AC_HELP_STRING(--with-osl-headers=dir,
+	[look for osl.h also in dir])])
+if test -n "$with_osl_headers"; then
+	osl_cppflags="-I$with_osl_headers"
+	CPPFLAGS="$CPPFLAGS $osl_cppflags"
+fi
+AC_ARG_WITH(osl_libs, [AC_HELP_STRING(--with-osl-libs=dir,
+	[look for libosl also in dir])])
+if test -n "$with_osl_libs"; then
+	osl_libs="-L$with_osl_libs"
+	LDFLAGS="$LDFLAGS $osl_libs"
+fi
+
 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:
+	AC_MSG_ERROR([libosl not found, download it at
+	http://systemlinux.org/~maan/osl
+or execute
 	git clone git://git.tuebingen.mpg.de/osl
-Install the library with
-	(cd osl && make && sudo make install)
 	])
 fi
+AC_SUBST(osl_cppflags)
+server_ldflags="$server_ldflags -L$with_osl_libs"
+CPPFLAGS="$OLD_CPPFLAGS"
+LDFLAGS="$OLD_LDFLAGS"
+LIBS="$OLD_LIBS"
 ########################################################################### ssl
 dnl @synopsis CHECK_SSL
 dnl