recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline"
recv_errlist_objs="http_recv recv_common recv time string net dccp_recv
- dccp fd"
+ dccp fd sched stdout"
recv_ldflags=""
filter_cmdline_objs="filter.cmdline compress_filter.cmdline"
-filter_errlist_objs="filter_chain wav compress filter string"
+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"
+ http_recv.cmdline dccp_recv.cmdline file_write.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"
+ time grab_client filter_chain wav compress http_recv dccp dccp_recv
+ recv_common fd sched write_common file_writer audiod_command"
audiod_ldflags=""
server_cmdline_objs="server.cmdline"
-server_errlist_objs="server mp3 afs command net string signal random_selector
+server_errlist_objs="server mp3_afh afs command net string signal random_selector
time daemon stat crypt http_send db close_on_fork playlist_selector
ipc dccp dccp_send fd"
server_ldflags=""
-write_cmdline_objs="write.cmdline"
-write_errlist_objs="write write_common file_writer time fd string"
+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"
+client_ldflags=""
########################################################################### ssl
dnl @synopsis 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"
########################################################################### ucred
fi
AC_ARG_ENABLE(mysql_libs, [AC_HELP_STRING(--enable-mysql-libs=dir,
[look for libmysqlclient also in dir])])
-if test -n "$enable_mysql_headers"; then
+if test -n "$enable_mysql_libs"; then
mysql_libs="-L$enable_mysql_libs"
LDFLAGS="$LDFLAGS $mysql_libs"
fi
server_ldflags="$server_ldflags $mysql_libs -lmysqlclient"
server_errlist_objs="$server_errlist_objs mysql_selector"
AC_SUBST(mysql_cppflags)
+ AC_SUBST(mysql_libs)
AC_DEFINE(HAVE_MYSQL, 1, [define to 1 to turn on mysql support])
else
AC_MSG_WARN([cannot build mysql-based audio file selector])
filter_cmdline_objs="$filter_cmdline_objs oggdec_filter.cmdline"
audiod_cmdline_objs="$audiod_cmdline_objs oggdec_filter.cmdline"
- server_errlist_objs="$server_errlist_objs ogg"
+ server_errlist_objs="$server_errlist_objs ogg_afh"
filter_errlist_objs="$filter_errlist_objs oggdec"
audiod_errlist_objs="$audiod_errlist_objs oggdec"
else
fi
########################################################################### faad
have_faad=yes
+AC_ARG_ENABLE(faad_headers, [AC_HELP_STRING(--enable-faad-headers=dir,
+ [look for neaacdec.h also in dir])])
+if test -n "$enable_faad_headers"; then
+ faad_cppflags="-I$enable_faad_headers"
+ CPPFLAGS="$CPPFLAGS $faad_cppflags"
+fi
+AC_ARG_ENABLE(faad_libs, [AC_HELP_STRING(--enable-fadd-libs=dir,
+ [look for libfaad also in dir])])
+if test -n "$enable_faad_libs"; then
+ faad_libs="-L$enable_faad_libs"
+ LDFLAGS="$LDFLAGS $faad_libs"
+fi
AC_CHECK_HEADER(neaacdec.h, [], have_faad=no)
AC_CHECK_LIB([faad], [NeAACDecOpen], [], have_faad=no)
if test "$have_faad" = "yes"; then
AC_DEFINE(HAVE_FAAD, 1, define to 1 if you want to build the aacdec filter)
- filter_errlist_objs="$filter_errlist_objs aacdec"
- audiod_errlist_objs="$audiod_errlist_objs aacdec"
- filter_ldflags="$filter_ldflags -lfaad"
- audiod_ldflags="$audiod_ldflags -lfaad"
+ filter_errlist_objs="$filter_errlist_objs aacdec aac_common"
+ audiod_errlist_objs="$audiod_errlist_objs aacdec aac_common"
+ server_errlist_objs="$server_errlist_objs aac_afh aac_common"
+ server_ldflags="$server_ldflags $faad_libs -lfaad"
+ filter_ldflags="$filter_ldflags $faad_libs -lfaad"
+ audiod_ldflags="$audiod_ldflags $faad_libs -lfaad"
+ AC_SUBST(faad_cppflags)
+ AC_SUBST(faad_libs)
else
AC_MSG_WARN([no aac support in para_audiod/para_filter])
fi
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"
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
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)
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)
AC_OUTPUT
AC_MSG_NOTICE([creating Makefile.deps])
-gcc -MM -MG $mysql_cppflags *.c > Makefile.deps
+gcc -MM -MG $mysql_cppflags $faad_cppflags *.c > Makefile.deps
AC_MSG_NOTICE([
paraslash configuration:
~~~~~~~~~~~~~~~~~~~~~~~~