X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=2da62d6c781f20a25d79488ed135202ea8ac0bf5;hp=fdc0b7ce5f286f9a6b976334a2589d5fe7613b18;hb=e70a7e228472a5d00803ad6b2225dec877860a58;hpb=ca659e6bf0d7f783849244105a077e79fcf741ad

diff --git a/configure.ac b/configure.ac
index fdc0b7ce..2da62d6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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"
@@ -153,6 +153,22 @@ 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_lib"; then
+	osl_libs="-L$with_osl_lib"
+	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
@@ -162,6 +178,11 @@ Install the library with
 	(cd osl && make && sudo make install)
 	])
 fi
+AC_SUBST(osl_cppflags)
+server_ldflags="$server_ldflags -L$with_osl_lib"
+CPPFLAGS="$OLD_CPPFLAGS"
+LDFLAGS="$OLD_LDFLAGS"
+LIBS="$OLD_LIBS"
 ########################################################################### ssl
 dnl @synopsis CHECK_SSL
 dnl