Merge /fml/ag-raetsch/home/maan/scm/paraslash/ into my-osx

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 81d1cbba04e4ffc08341cee2528c0313f22bc7b2..77534de2fd6bc1d09931bff9cdaf857a1945ea8f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS([arpa/inet.h ctype.h fcntl.h limits.h netdb.h netinet/in.h stdlib.h \
-       string.h sys/socket.h sys/time.h sys/timeb.h sys/un.h sys/ipc.h unistd.h utime.h malloc.h], \
+       string.h sys/socket.h sys/time.h sys/timeb.h sys/un.h sys/ipc.h unistd.h utime.h], \
        [], [AC_MSG_ERROR([$ac_header not found])])
 
 AC_CHECK_HEADER(linux/soundcard.h, [extras="$extras para_fade"], 
@@ -68,10 +68,11 @@ audioc_cmdline_objs="audioc.cmdline"
 audioc_errlist_objs="audioc string net fd"
 
 audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline
-       http_recv.cmdline dccp_recv.cmdline file_write.cmdline"
-audiod_errlist_objs="audiod exec close_on_fork signal string daemon stat net
+       http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline"
+audiod_errlist_objs="audiod signal string daemon stat net
        time grab_client filter_chain wav compress http_recv dccp dccp_recv
-       recv_common fd sched write_common file_writer audiod_command"
+       recv_common fd sched write_common file_writer audiod_command crypt
+       client_common"
 audiod_ldflags=""
 
 server_cmdline_objs="server.cmdline"
@@ -137,6 +138,7 @@ if test "$enable_ssldir" = "yes"; then enable_ssldir=""; fi
 CHECK_SSL($enable_ssldir)
 server_ldflags="$srver_ldflags $SSL_LDFLAGS $SSL_LIBS"
 client_ldflags="$client_ldflags $SSL_LDFLAGS $SSL_LIBS"
+audiod_ldflags="$audiod_ldflags $SSL_LDFLAGS $SSL_LIBS"
 
 ########################################################################### ucred