configure.ac: do not check for malloc.h

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5844b7a737869281e7a8af4b432a195ee14f4fb4..3e6e91a55ea0dfcfeb25b9afe7f9e3168c99fecd 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"], 
@@ -64,10 +64,15 @@ filter_cmdline_objs="filter.cmdline compress_filter.cmdline"
 filter_errlist_objs="filter_chain wav compress filter string stdin stdout sched fd"
 filter_ldflags=""
 
+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"
-audiod_errlist_objs="audiod exec close_on_fork signal string daemon stat net
-       time grab_client filter_chain wav compress http_recv dccp dccp_recv recv_common fd sched"
+       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 crypt
+       client_common"
 audiod_ldflags=""
 
 server_cmdline_objs="server.cmdline"
@@ -76,11 +81,14 @@ server_errlist_objs="server mp3_afh afs command net string signal random_selecto
        ipc dccp dccp_send fd"
 server_ldflags=""
 
-write_cmdline_objs="write.cmdline"
+write_cmdline_objs="write.cmdline file_write.cmdline"
 write_errlist_objs="write write_common file_writer time fd string sched stdin"
 write_ldflags=""
 write_writers="file"
 
+client_cmdline_objs="client.cmdline"
+client_errlist_objs="client net string crypt fd sched stdin stdout client_common"
+client_ldflags=""
 
 ########################################################################### ssl
 dnl @synopsis CHECK_SSL
@@ -125,10 +133,12 @@ AC_DEFUN([CHECK_SSL],
 ])dnl
 
 AC_ARG_ENABLE(ssldir, [AS_HELP_STRING(--enable-ssldir=path,
-                [Search for openssl also in path.])])
+       [Search for openssl also in path.])])
 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
 
@@ -263,7 +273,7 @@ else
 fi
 ########################################################################### alsa
 have_alsa="yes"
-msg="=> no alsa support for para_write"
+msg="=> no alsa support for para_audiod/para_write"
 AC_CHECK_HEADERS([alsa/asoundlib.h], [], [
        AC_MSG_WARN([no alsa/asoundlib $msg])
        have_alsa="no"
@@ -273,7 +283,12 @@ AC_CHECK_LIB([asound], [snd_pcm_open], [], [
        have_alsa="no"
 ])
 if test "$have_alsa" = "yes"; then
+       audiod_errlist_objs="$audiod_errlist_objs alsa_writer"
+       audiod_cmdline_objs="$audiod_cmdline_objs alsa_write.cmdline"
+       audiod_ldflags="$audiod_ldflags -lasound"
+
        write_errlist_objs="$write_errlist_objs alsa_writer"
+       write_cmdline_objs="$write_cmdline_objs alsa_write.cmdline"
        write_ldflags="$write_ldflags -lasound"
        write_writers="$write_writers alsa"
 fi
@@ -347,6 +362,8 @@ filter_objs="$filter_cmdline_objs $filter_errlist_objs"
 audiod_objs="$audiod_cmdline_objs $audiod_errlist_objs"
 server_objs="$server_cmdline_objs $server_errlist_objs"
 write_objs="$write_cmdline_objs $write_errlist_objs"
+client_objs="$client_cmdline_objs $client_errlist_objs"
+audioc_objs="$audioc_cmdline_objs $audioc_errlist_objs"
 
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
 AC_SUBST(recv_ldflags, $recv_ldflags)
@@ -373,6 +390,15 @@ AC_SUBST(write_ldflags, $write_ldflags)
 AC_DEFINE_UNQUOTED(INIT_WRITE_ERRLISTS,
        objlist_to_errlist($write_errlist_objs), errors used by para_write)
 
+AC_SUBST(client_objs, add_dot_o($client_objs))
+AC_SUBST(client_ldflags, $client_ldflags)
+AC_DEFINE_UNQUOTED(INIT_CLIENT_ERRLISTS,
+       objlist_to_errlist($client_errlist_objs), errors used by para_client)
+
+AC_SUBST(audioc_objs, add_dot_o($audioc_objs))
+AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS,
+       objlist_to_errlist($audioc_errlist_objs), errors used by para_audioc)
+
 enum="$(for i in $write_writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"
 AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
        enum of supported writers)