X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=configure.ac;h=1190821cbdd1fb6697c09b13bc1c328838d4b2a9;hb=5957ec3c6deb0a5585f979ff470e9a346154ca62;hp=32381c6b1ceec6dfd2586a1f73c0cdd4804ce855;hpb=32e646780461f96682d1191d31e08e4602ab125e;p=paraslash.git

diff --git a/configure.ac b/configure.ac
index 32381c6b..1190821c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,7 @@ 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 mm
 server_command_list afs_command_list audiod_command_list bitstream imdct wma_afh
-wma_common wmadec_filter buffer_tree
+wma_common wmadec_filter buffer_tree crypt_common
 "
 
 executables="recv filter audioc write client afh audiod"
@@ -115,7 +115,7 @@ audioc_errlist_objs="audioc string net fd"
 audioc_ldflags=""
 
 audiod_cmdline_objs="add_cmdline(audiod compress_filter http_recv dccp_recv file_write client amp_filter udp_recv prebuffer_filter)"
-audiod_errlist_objs="audiod signal string daemon stat net
+audiod_errlist_objs="audiod signal string daemon stat net crypt_common
 	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 prebuffer_filter audiod_command_list
@@ -129,7 +129,7 @@ afh_ldflags=""
 
 server_cmdline_objs="add_cmdline(server)"
 server_errlist_objs="server afh_common mp3_afh vss command net string signal
-	time daemon crypt http_send close_on_fork mm
+	time daemon http_send close_on_fork mm crypt crypt_common
 	ipc dccp_send fd user_list chunk_queue afs aft mood score attribute
 	blob playlist sched acl send_common udp_send color fec
 	server_command_list afs_command_list wma_afh wma_common"
@@ -144,8 +144,8 @@ writers=" file"
 default_writer="FILE_WRITE"
 
 client_cmdline_objs="add_cmdline(client)"
-client_errlist_objs="client net string crypt fd sched stdin stdout time
-	client_common buffer_tree"
+client_errlist_objs="client net string fd sched stdin stdout time
+	client_common buffer_tree crypt crypt_common"
 client_ldflags=""
 
 gui_cmdline_objs="add_cmdline(gui)"
@@ -727,6 +727,67 @@ fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
+########################################################################### libao
+OLD_CPPFLAGS="$CPPFLAGS"
+OLD_LD_FLAGS="$LDFLAGS"
+OLD_LIBS="$LIBS"
+
+have_ao="yes"
+AC_ARG_WITH(ao_headers, [AC_HELP_STRING(--with-ao-headers=dir,
+	[look for ao/ao.h also in dir])])
+if test -n "$with_ao_headers"; then
+	ao_cppflags="-I$with_ao_headers"
+	CPPFLAGS="$CPPFLAGS $ao_cppflags"
+fi
+AC_ARG_WITH(ao_libs, [AC_HELP_STRING(--with-ao-libs=dir,
+	[look for libao also in dir])])
+if test -n "$with_ao_libs"; then
+	ao_libs="-L$with_ao_libs"
+	LDFLAGS="$LDFLAGS $ao_libs"
+fi
+msg="no libao support for para_audiod/para_write"
+AC_CHECK_HEADERS([ao/ao.h], [
+	], [
+	have_ao="no"
+	AC_MSG_WARN([ao.h not found, $msg])
+])
+if test "$have_ao" = "yes"; then
+	AC_CHECK_LIB([ao], [ao_initialize], [], [
+		have_ao="no"
+		AC_MSG_WARN([ao lib not found or not working, $msg])
+	])
+fi
+if test "$have_ao" = "yes"; then
+	AC_CHECK_HEADERS([pthread.h], [
+		], [
+		have_ao="no"
+		AC_MSG_WARN([pthread.h not found, $msg])
+	])
+fi
+if test "$have_ao" = "yes"; then
+	AC_CHECK_LIB([pthread], [pthread_create], [], [
+		have_ao="no"
+		AC_MSG_WARN([pthread lib not found or not working, $msg])
+	])
+fi
+if test "$have_ao" = "yes"; then
+	all_errlist_objs="$all_errlist_objs ao_write"
+	audiod_errlist_objs="$audiod_errlist_objs ao_write"
+	audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(ao_write)"
+	audiod_ldflags="$audiod_ldflags -lao -lpthread"
+
+	write_errlist_objs="$write_errlist_objs ao_write"
+	write_cmdline_objs="$write_cmdline_objs add_cmdline(ao_write)"
+	write_ldflags="$write_ldflags $ao_libs -lao -lpthread"
+	writers="$writers ao"
+	AC_SUBST(ao_cppflags)
+fi
+
+CPPFLAGS="$OLD_CPPFLAGS"
+LDFLAGS="$OLD_LDFLAGS"
+LIBS="$OLD_LIBS"
+
+
 
 AC_SUBST(install_sh, [$INSTALL])
 AC_CONFIG_FILES([Makefile])
@@ -746,7 +807,7 @@ for obj in $all_errlist_objs; do
 done
 AC_DEFINE_UNQUOTED(DEFINE_ERRLIST_OBJECT_ENUM,
 	[enum {$SS NUM_SS}],
-	[list of all objects that use paraslash's error facility]
+	[list of all objects that use the paraslash error facility]
 )
 
 ################################################################## status items