X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=8904281235c49caaef2211d008f399c80de19e26;hp=4583b1eb3fb5dfb251496bb15f6c70463009ad23;hb=c41a04fb296e068ebfec78bba9678bf15daea896;hpb=226ce82aaccff7e74a6fadd028743b731a3744d2

diff --git a/configure.ac b/configure.ac
index 4583b1eb..89042812 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,12 +31,12 @@ AC_REPLACE_FNMATCH
 AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
+AC_HEADER_STDBOOL
 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 stddef.h],
 	[], [AC_MSG_ERROR([$ac_header not found])])
 
-
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE
@@ -45,6 +45,7 @@ AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_STRUCT_TM
+AC_TYPE_INT8_T
 AC_TYPE_INT16_T
 AC_TYPE_INT32_T
 AC_TYPE_INT64_T
@@ -75,7 +76,7 @@ AC_FUNC_LSTAT
 AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
 	regcomp select strchr strdup strerror strstr strtol uname \
 	fchdir gettimeofday localtime_r munmap strcasecmp strcspn \
-	strncasecmp strrchr strspn alarm mkdir rmdir], [],
+	strncasecmp strrchr strspn alarm mkdir inet_ntoa socket], [],
 	[AC_MSG_ERROR([function not found, cannot live without it])])
 
 cmdline_dir="cmdline"
@@ -86,29 +87,26 @@ AC_DEFUN([add_cmdline],[$(for i in $@; do printf "${i}.cmdline "; done)])
 all_errlist_objs="server mp3_afh afh_common vss command net string signal time
 daemon stat crypt http_send close_on_fork ipc acl afh fade amp_filter
 dccp_send fd user_list chunk_queue afs aft mood score attribute blob ringbuffer
-playlist sha1 sched audiod grab_client filter_common wav_filter compress_filter
+playlist sched audiod grab_client filter_common wav_filter compress_filter
 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 mdct wma_afh
-wma_common wmadec_filter
+server_command_list afs_command_list audiod_command_list bitstream imdct wma_afh
+wma_common wmadec_filter buffer_tree
 "
 
-all_executables="server recv filter audioc write client afh"
+executables="recv filter audioc write client afh audiod"
 
 recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv)"
 
 recv_errlist_objs="http_recv recv_common recv time string net dccp_recv
-	fd sched stdout ggo udp_recv fec"
+	fd sched stdout ggo udp_recv fec buffer_tree"
 recv_ldflags=""
 
-receivers=" http dccp udp"
-senders=" http dccp udp"
-
 filter_cmdline_objs="add_cmdline(filter compress_filter amp_filter prebuffer_filter)"
 filter_errlist_objs="filter_common wav_filter compress_filter filter string
 	stdin stdout sched fd amp_filter ggo fecdec_filter fec
-	prebuffer_filter time bitstream mdct wma_common wmadec_filter"
+	prebuffer_filter time bitstream imdct wma_common wmadec_filter buffer_tree"
 filter_ldflags="-lm"
 filters=" compress wav amp fecdec wmadec prebuffer"
 
@@ -120,10 +118,10 @@ audiod_cmdline_objs="add_cmdline(audiod compress_filter http_recv dccp_recv file
 audiod_errlist_objs="audiod signal string daemon stat net
 	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 sha1 audiod_command_list
-	bitstream mdct wma_common wmadec_filter"
-audiod_ldflags=""
-audiod_audio_formats=""
+	client_common ggo udp_recv color fec prebuffer_filter audiod_command_list
+	bitstream imdct wma_common wmadec_filter buffer_tree"
+audiod_ldflags="-lm"
+audiod_audio_formats="wma"
 
 afh_cmdline_objs="add_cmdline(afh)"
 afh_errlist_objs="afh string fd mp3_afh afh_common time wma_afh wma_common"
@@ -133,20 +131,21 @@ 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
 	ipc dccp_send fd user_list chunk_queue afs aft mood score attribute
-	blob playlist sha1 sched acl send_common udp_send color fec
+	blob playlist sched acl send_common udp_send color fec
 	server_command_list afs_command_list wma_afh wma_common"
-server_ldflags="-losl"
-server_audio_formats=" mp3"
+server_ldflags=""
+server_audio_formats="mp3 wma"
 
 write_cmdline_objs="add_cmdline(write file_write)"
-write_errlist_objs="write write_common file_write time fd string sched stdin ggo"
+write_errlist_objs="write write_common file_write time fd string sched stdin
+	buffer_tree ggo"
 write_ldflags=""
 writers=" file"
 default_writer="FILE_WRITE"
 
 client_cmdline_objs="add_cmdline(client)"
-client_errlist_objs="client net string crypt fd sched stdin stdout
-	client_common sha1"
+client_errlist_objs="client net string crypt fd sched stdin stdout time
+	client_common buffer_tree"
 client_ldflags=""
 
 gui_cmdline_objs="add_cmdline(gui)"
@@ -158,6 +157,86 @@ fade_cmdline_objs="add_cmdline(fade)"
 fade_errlist_objs="fade exec string fd"
 
 
+########################################################################### snprintf
+# ===========================================================================
+#        http://www.nongnu.org/autoconf-archive/ax_func_snprintf.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_FUNC_SNPRINTF
+#
+# DESCRIPTION
+#
+#   Checks for a fully C99 compliant snprintf, in particular checks whether
+#   it does bounds checking and returns the correct string length; does the
+#   same check for vsnprintf. If no working snprintf or vsnprintf is found,
+#   it prints an error message and aborts.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Ruediger Kuhlmann <info@ruediger-kuhlmann.de>
+#
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved.
+
+AU_ALIAS([AC_FUNC_SNPRINTF], [AX_FUNC_SNPRINTF])
+AC_DEFUN([AX_FUNC_SNPRINTF],
+[AC_CHECK_FUNCS(snprintf vsnprintf)
+AC_MSG_CHECKING(for working snprintf)
+AC_CACHE_VAL(ac_cv_have_working_snprintf,
+[AC_TRY_RUN(
+[#include <stdio.h>
+
+int main(void)
+{
+    char bufs[5] = { 'x', 'x', 'x', '\0', '\0' };
+    char bufd[5] = { 'x', 'x', 'x', '\0', '\0' };
+    int i;
+    i = snprintf (bufs, 2, "%s", "111");
+    if (strcmp (bufs, "1")) exit (1);
+    if (i != 3) exit (1);
+    i = snprintf (bufd, 2, "%d", 111);
+    if (strcmp (bufd, "1")) exit (1);
+    if (i != 3) exit (1);
+    exit(0);
+}], ac_cv_have_working_snprintf=yes, ac_cv_have_working_snprintf=no, ac_cv_have_working_snprintf=cross)])
+AC_MSG_RESULT([$ac_cv_have_working_snprintf])
+AC_MSG_CHECKING(for working vsnprintf)
+AC_CACHE_VAL(ac_cv_have_working_vsnprintf,
+[AC_TRY_RUN(
+[#include <stdio.h>
+#include <stdarg.h>
+
+int my_vsnprintf (char *buf, const char *tmpl, ...)
+{
+    int i;
+    va_list args;
+    va_start (args, tmpl);
+    i = vsnprintf (buf, 2, tmpl, args);
+    va_end (args);
+    return i;
+}
+
+int main(void)
+{
+    char bufs[5] = { 'x', 'x', 'x', '\0', '\0' };
+    char bufd[5] = { 'x', 'x', 'x', '\0', '\0' };
+    int i;
+    i = my_vsnprintf (bufs, "%s", "111");
+    if (strcmp (bufs, "1")) exit (1);
+    if (i != 3) exit (1);
+    i = my_vsnprintf (bufd, "%d", 111);
+    if (strcmp (bufd, "1")) exit (1);
+    if (i != 3) exit (1);
+    exit(0);
+}], ac_cv_have_working_vsnprintf=yes, ac_cv_have_working_vsnprintf=no, ac_cv_have_working_vsnprintf=cross)])
+AC_MSG_RESULT([$ac_cv_have_working_vsnprintf])
+if test x$ac_cv_have_working_snprintf$ac_cv_have_working_vsnprintf != "xyesyes"; then
+AC_MSG_ERROR([fatal: buggy snprintf() detected])
+fi])
+AX_FUNC_SNPRINTF()
 ########################################################################### osl
 have_osl=yes
 OLD_CPPFLAGS="$CPPFLAGS"
@@ -179,60 +258,67 @@ 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
-	AC_MSG_ERROR([libosl not found, download it at
+	AC_MSG_WARN([libosl not found, can not build para_server.
+Download libosl at
 	http://systemlinux.org/~maan/osl
 or execute
 	git clone git://git.tuebingen.mpg.de/osl
 	])
+else
+	extras="$extras server"
+	executables="$executables server"
+	AC_SUBST(osl_cppflags)
+	server_ldflags="$server_ldflags $osl_libs -losl"
 fi
-AC_SUBST(osl_cppflags)
-server_ldflags="$server_ldflags -L$with_osl_libs"
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
-########################################################################### ssl
-dnl @synopsis CHECK_SSL
-dnl
-dnl based on the follwing macro from the autoconf archive
-dnl
-dnl @category InstalledPackages
-dnl @author Mark Ethan Trostler <trostler@juniper.net>
-dnl @version 2003-01-28
-dnl @license AllPermissive
-
-AC_DEFUN([CHECK_SSL],
-[
-	for ssldir in $1 /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do
-		AC_MSG_CHECKING(for openssl in $ssldir)
-		if test -f "$ssldir/include/openssl/ssl.h"; then
-			found_ssl="yes"
-			AC_MSG_RESULT(yes)
-			SSL_CFLAGS="-I$ssldir/include"
-			SSL_CPPFLAGS="-I$ssldir/include"
-			break
-		fi
-		AC_MSG_RESULT(no)
-	done
-	if test x_$found_ssl != x_yes; then
-		AC_MSG_ERROR(Cannot find ssl libraries)
-	else
-		SSL_LIBS="-lssl -lcrypto";
-		SSL_LDFLAGS="-L$ssldir/lib";
+###################################################################### openssl
+OLD_CPPFLAGS="$CPPFLAGS"
+OLD_LD_FLAGS="$LDFLAGS"
+OLD_LIBS="$LIBS"
+have_openssl="yes"
+AC_ARG_WITH(openssl_headers, [AC_HELP_STRING(--with-openssl-headers=dir,
+	[look for openssl headers also in dir])])
+if test -n "$with_openssl_headers"; then
+	openssl_cppflags="-I$with_openssl_headers"
+	CPPFLAGS="$CPPFLAGS $openssl_cppflags"
+fi
+AC_ARG_WITH(openssl_libs, [AC_HELP_STRING(--with-openssl-libs=dir,
+	[look for openssl libraries also in dir])])
+if test -n "$with_openssl_libs"; then
+	openssl_libs="-L$with_openssl_libs"
+	LDFLAGS="$LDFLAGS $openssl_libs"
+fi
+AC_CHECK_HEADER(openssl/ssl.h, [], [have_openssl="no"])
+AC_CHECK_LIB([crypto], [RAND_bytes], [], [have_openssl="no"])
+if test "$have_openssl" = "no" -a -z "$with_openssl_headers$with_openssl_libs"; then
+	# try harder: openssl is sometimes installed in /usr/local/ssl
+	openssl_cppflags="-I/usr/local/ssl/include"
+	CPPFLAGS="$CPPFLAGS $openssl_cppflags"
+	openssl_libs="-L/usr/local/ssl/lib"
+	LDFLAGS="$LDFLAGS $openssl_libs"
+	# clear cache
+	unset ac_cv_header_openssl_ssl_h 2> /dev/null
+	unset ac_cv_lib_crypto_RAND_bytes 2> /dev/null
+	AC_CHECK_HEADER(openssl/ssl.h, [have_openssl="yes"], [])
+	if test "$have_openssl" = "yes"; then
+		AC_CHECK_LIB([crypto], [RAND_bytes], [], [have_openssl="no"])
 	fi
-	AC_SUBST(SSL_CPPFLAGS)
-	AC_SUBST(SSL_CFLAGS)
-	AC_SUBST(SSL_LIBS)
-	AC_SUBST(SSL_LDFLAGS)
-])dnl
-
-AC_ARG_ENABLE(ssldir, [AS_HELP_STRING(--enable-ssldir=path,
-	[Search for openssl also in path.])])
-if test "$enable_ssldir" = "yes"; then enable_ssldir=""; fi
-CHECK_SSL($enable_ssldir)
-server_ldflags="$server_ldflags $SSL_LDFLAGS $SSL_LIBS"
-client_ldflags="$client_ldflags $SSL_LDFLAGS $SSL_LIBS"
-audiod_ldflags="$audiod_ldflags $SSL_LDFLAGS $SSL_LIBS"
-
+fi
+if test "$have_openssl" = "yes"; then
+	AC_DEFINE(HAVE_OPENSSL, 1, [define to 1 to turn on openssl support])
+	AC_SUBST(openssl_cppflags)
+	openssl_libs="$openssl_libs -lssl -lcrypto"
+	server_ldflags="$server_ldflags $openssl_libs"
+	client_ldflags="$client_ldflags $openssl_libs"
+	audiod_ldflags="$audiod_ldflags $openssl_libs"
+else
+	AC_MSG_ERROR([openssl libraries not found])
+fi
+CPPFLAGS="$OLD_CPPFLAGS"
+LDFLAGS="$OLD_LDFLAGS"
+LIBS="$OLD_LIBS"
 ########################################################################### libsocket
 AC_CHECK_LIB([c], [socket],
 	[socket_lib=],
@@ -273,34 +359,33 @@ if test ${have_ucred} = yes; then
 fi
 
 ########################################################################### curses
-have_ncurses="yes"
+have_curses="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
 OLD_LD_FLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
-AC_ARG_WITH(ncurses_headers, [AC_HELP_STRING(--with-ncurses-headers=dir,
-	[look for ncurses.h also in dir])])
-if test -n "$with_ncurses_headers"; then
-	ncurses_cppflags="-I$with_ncurses_headers"
-	CPPFLAGS="$CPPFLAGS $ncurses_cppflags"
-fi
-AC_ARG_WITH(ncurses_libs, [AC_HELP_STRING(--with-ncurses-libs=dir,
-	[look for libncurses also in dir])])
-if test -n "$with_ncurses_libs"; then
-	ncurses_libs="-L$with_ncurses_libs"
-	LDFLAGS="$LDFLAGS $ncurses_libs"
+AC_ARG_WITH(curses_headers, [AC_HELP_STRING(--with-curses-headers=dir,
+	[look for curses.h also in dir])])
+if test -n "$with_curses_headers"; then
+	curses_cppflags="-I$with_curses_headers"
+	CPPFLAGS="$CPPFLAGS $curses_cppflags"
+fi
+AC_ARG_WITH(curses_libs, [AC_HELP_STRING(--with-curses-libs=dir,
+	[look for libcurses also in dir])])
+if test -n "$with_curses_libs"; then
+	curses_libs="-L$with_curses_libs"
+	LDFLAGS="$LDFLAGS $curses_libs"
 fi
 AC_CHECK_HEADER(curses.h, [], [
-	have_ncurses="no"
+	have_curses="no"
 ])
-AC_CHECK_LIB([ncurses], [initscr], [], [
-	have_ncurses="no"
+AC_CHECK_LIB([curses], [initscr], [], [
+	have_curses="no"
 ])
-if test "$have_ncurses" = "yes"; then
-	AC_SUBST(ncurses_cppflags)
-	AC_SUBST(ncurses_libs)
-	AC_DEFINE(HAVE_NCURSES, 1, [define to 1 to turn on ncurses support])
-	extras="$extras para_gui"
-	all_executables="$all_executables gui"
+if test "$have_curses" = "yes"; then
+	AC_SUBST(curses_cppflags)
+	AC_DEFINE(HAVE_NCURSES, 1, [define to 1 to turn on curses support])
+	extras="$extras gui"
+	executables="$executables gui"
 else
 	AC_MSG_WARN([cannot build para_gui])
 fi
@@ -349,53 +434,122 @@ if test ${have_core_audio} = yes; then
 	default_writer="OSX_WRITE"
 	AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X)
 fi
-########################################################################### ogg
+########################################################### ogg/vorbis/speex
 have_ogg="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
 OLD_LD_FLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
-AC_ARG_WITH(oggvorbis_headers, [AC_HELP_STRING(--with-oggvorbis-headers=dir,
-	[look for vorbis/codec.h also in dir])])
-if test -n "$with_oggvorbis_headers"; then
-	oggvorbis_cppflags="-I$with_oggvorbis_headers"
-	CPPFLAGS="$CPPFLAGS $oggvorbis_cppflags"
+AC_ARG_WITH(ogg_headers, [AC_HELP_STRING(--with-ogg-headers=dir,
+	[look for ogg headers also in dir])])
+AC_ARG_WITH(ogg_libs, [AC_HELP_STRING(--with-ogg-libs=dir,
+	[look for ogg libs also in dir])])
+AC_ARG_WITH(vorbis_headers, [AC_HELP_STRING(--with-vorbis-headers=dir,
+	[look for vorbis headers also in dir])])
+AC_ARG_WITH(vorbis_libs, [AC_HELP_STRING(--with-vorbis-libs=dir,
+	[look for vorbis libs also in dir])])
+AC_ARG_WITH(speex_headers, [AC_HELP_STRING(--with-speex-headers=dir,
+	[look for speex headers also in dir])])
+AC_ARG_WITH(speex_libs, [AC_HELP_STRING(--with-speex-libs=dir,
+	[look for speex libs also in dir])])
+
+if test -n "$with_ogg_headers"; then
+	ogg_cppflags="-I$with_ogg_headers"
+	CPPFLAGS="$CPPFLAGS $ogg_cppflags"
 fi
-AC_ARG_WITH(oggvorbis_libs, [AC_HELP_STRING(--with-oggvorbis-libs=dir,
-	[look for oggvorbis libs also in dir])])
-if test -n "$with_oggvorbis_libs"; then
-	oggvorbis_libs="-L$with_oggvorbis_libs"
-	LDFLAGS="$LDFLAGS $oggvorbis_libs"
+if test -n "$with_ogg_libs"; then
+	ogg_libs="-L$with_ogg_libs"
+	LDFLAGS="$LDFLAGS $ogg_libs"
 fi
-
+AC_CHECK_HEADERS([ogg/ogg.h], [], [ have_ogg="no"; ])
 AC_CHECK_LIB([ogg], [ogg_stream_init], [], [ have_ogg="no" ])
-AC_CHECK_LIB([vorbis], [vorbis_info_init], [], [ have_ogg="no" ])
-AC_CHECK_HEADERS([ogg/ogg.h vorbis/codec.h], [], [ have_ogg="no" ])
+
+have_vorbis="yes"
+have_speex="yes"
 if test "$have_ogg" = "yes"; then
-	all_errlist_objs="$all_errlist_objs oggdec_filter ogg_afh"
-	AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg vorbis support)
-	filters="$filters oggdec"
-	if test "$OSTYPE" = "Darwin"; then
-		oggvorbis_libs="-Wl,-bind_at_load  $oggvorbis_libs"
+	# vorbis
+	if test -n "$with_vorbis_headers"; then
+		vorbis_cppflags="-I$with_vorbis_headers"
+		CPPFLAGS="$CPPFLAGS $vorbis_cppflags"
+	fi
+	if test -n "$with_vorbis_libs"; then
+		vorbis_libs="-L$with_vorbis_libs"
+		LDFLAGS="$LDFLAGS $vorbis_libs"
+	fi
+	AC_CHECK_HEADERS([vorbis/codec.h], [], [ have_vorbis="no" ])
+	AC_CHECK_LIB([vorbis], [vorbis_info_init], [], [ have_vorbis="no" ])
+
+	# speex
+	if test -n "$with_speex_headers"; then
+		speex_cppflags="-I$with_speex_headers"
+		CPPFLAGS="$CPPFLAGS $speex_cppflags"
+	fi
+	if test -n "$with_speex_libs"; then
+		speex_libs="-L$with_speex_libs"
+		LDFLAGS="$LDFLAGS $speex_libs"
 	fi
-	server_ldflags="$server_ldflags $oggvorbis_libs -logg -lvorbis -lvorbisfile"
-	filter_ldflags="$filter_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
-	audiod_ldflags="$audiod_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
-	afh_ldflags="$afh_ldflags $oggvorbis_libs -logg -lvorbis -lvorbisfile"
+	AC_CHECK_LIB([speex], [speex_decoder_init], [], [ have_speex="no" ])
+	AC_CHECK_HEADERS([speex/speex.h], [], [ have_speex="no" ])
+else
+	have_vorbis="no"
+	have_speex="no"
+fi
 
-	filter_cmdline_objs="$filter_cmdline_objs add_cmdline(oggdec_filter)"
-	audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(oggdec_filter)"
+msg="support in para_server/para_filter/para_afh"
+if test "$have_vorbis" = "yes" || test "$have_speex" = "yes"; then
+	AC_SUBST(ogg_cppflags)
+	ogg_libs="$ogg_libs -logg"
+	if test "$OSTYPE" = "Darwin"; then
+		ogg_libs="-Wl,-bind_at_load $ogg_libs"
+	fi
+	server_ldflags="$server_ldflags $ogg_libs"
+	filter_ldflags="$filter_ldflags $ogg_libs"
+	audiod_ldflags="$audiod_ldflags $ogg_libs"
+	afh_ldflags="$afh_ldflags $ogg_libs"
+	all_errlist_objs="$all_errlist_objs ogg_afh_common"
+	afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
+	server_errlist_objs="$server_errlist_objs ogg_afh_common"
+else
+	AC_MSG_WARN([vorbis/speex require ogg])
+fi
+if test "$have_vorbis" = "yes"; then
+	all_errlist_objs="$all_errlist_objs oggdec_filter ogg_afh"
+	AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg/vorbis support)
+	filters="$filters oggdec"
+	vorbis_libs="-lvorbis -lvorbisfile"
+	server_ldflags="$server_ldflags $vorbis_libs"
+	filter_ldflags="$filter_ldflags $vorbis_libs"
+	audiod_ldflags="$audiod_ldflags $vorbis_libs"
+	afh_ldflags="$afh_ldflags $vorbis_libs"
 
 	server_errlist_objs="$server_errlist_objs ogg_afh"
 	filter_errlist_objs="$filter_errlist_objs oggdec_filter"
 	audiod_errlist_objs="$audiod_errlist_objs oggdec_filter"
 	afh_errlist_objs="$afh_errlist_objs ogg_afh"
 
-	audiod_audio_formats="ogg"
+	audiod_audio_formats="$audiod_audio_formats ogg"
 	server_audio_formats="$server_audio_formats ogg"
-	AC_SUBST(oggvorbis_cppflags)
-	AC_SUBST(oggvorbis_libs)
 else
-	AC_MSG_WARN([no ogg vorbis support in para_server/para_filter])
+	AC_MSG_WARN([no ogg/vorbis $msg])
+fi
+if test "$have_speex" = "yes"; then
+	all_errlist_objs="$all_errlist_objs spxdec_filter spx_afh spx_common"
+	AC_DEFINE(HAVE_SPEEX, 1, define to 1 to turn on ogg/speex support)
+	filters="$filters spxdec"
+	speex_libs="-lspeex"
+	server_ldflags="$server_ldflags $speex_libs"
+	filter_ldflags="$filter_ldflags $speex_libs"
+	audiod_ldflags="$audiod_ldflags $speex_libs"
+	afh_ldflags="$afh_ldflags $speex_libs"
+
+	server_errlist_objs="$server_errlist_objs spx_afh spx_common"
+	filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common"
+	audiod_errlist_objs="$audiod_errlist_objs spxdec_filter spx_common"
+	afh_errlist_objs="$afh_errlist_objs spx_afh spx_common"
+
+	audiod_audio_formats="$audiod_audio_formats spx"
+	server_audio_formats="$server_audio_formats spx"
+else
+	AC_MSG_WARN([no ogg/speex $msg])
 fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
@@ -434,7 +588,6 @@ if test "$have_faad" = "yes"; then
 	server_audio_formats="$server_audio_formats aac"
 	filters="$filters aacdec"
 	AC_SUBST(faad_cppflags)
-	AC_SUBST(faad_libs)
 else
 	AC_MSG_WARN([no aac support in para_audiod/para_filter])
 fi
@@ -477,16 +630,9 @@ if test "$have_mad" = "yes"; then
 	audiod_audio_formats="$audiod_audio_formats mp3"
 	filters="$filters mp3dec"
 	AC_SUBST(mad_cppflags)
-	AC_SUBST(mad_libs)
 else
 	AC_MSG_WARN([no mp3dec support in para_audiod/para_filter])
 fi
-if test -n "$audiod_audio_formats"; then
-	extras="$extras para_audiod"
-	all_executables="$all_executables audiod"
-else
-	AC_MSG_WARN([can not build para_audiod (no supported audio formats)])
-fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
@@ -514,8 +660,8 @@ have_oss="yes"
 msg="=> will not build para_fade/oss writer"
 
 AC_CHECK_HEADER(sys/soundcard.h, [
-	extras="$extras para_fade"
-	all_executables="$all_executables fade"
+	extras="$extras fade"
+	executables="$executables fade"
 	all_errlist_objs="$all_errlist_objs oss_write"
 	audiod_errlist_objs="$audiod_errlist_objs oss_write"
 	audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(oss_write)"
@@ -581,65 +727,84 @@ 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(extra_binaries, [$extras])
-AC_SUBST(extra_filter_objs, [$extra_filter_objs])
-AC_SUBST(extra_filter_libs, [$extra_filter_libs])
 AC_SUBST(install_sh, [$INSTALL])
 AC_CONFIG_FILES([Makefile])
 
 
 AC_DEFUN([add_dot_o],[$(for i in $@; do printf "$i.o "; done)])
+AC_DEFUN([add_para],[$(for i in $@; do printf "para_$i "; done)])
 AC_DEFUN([objlist_to_errlist],[$(for i in $@; do printf "DEFINE_ERRLIST($(echo $i| tr 'a-z' 'A-Z'));"; done) [const char **para_errlist[[]]] = {$(for i in $@; do printf "PARA_ERRLIST($(echo $i | tr 'a-z' 'A-Z')), "; done) }])
-
 ############################################################# error2.h
-AC_DEFUN([define_safe_error_enums],
-[
-	exe=""
-	for i in $all_executables; do
-#		eval echo checking if $1 is linked into $i
-		for j in $(eval echo \$${i}_errlist_objs); do
-			if test $j = $1; then
-				exe="$exe $i"
-				break;
-			fi
-		done
-	done
-	#echo "$1 gets linked into $exe"
-	safe_errlists=""
-	for i in $all_errlist_objs; do
-		for j in $exe; do
-			found=0
-			for k in $(eval echo \$${j}_errlist_objs); do
-				if test $k = $i; then
-					found=1
-					break;
-				fi
-			done
-			if test $found -eq 0; then
-				break;
-			fi
-		done
-		if test $found -eq 1; then
-			safe_errlists="$safe_errlists $i"
-		fi
-	done
-	#echo "safe errlists for $1: $safe_errlists"
-	ss_defs=""
-	for i in $safe_errlists; do
-		echo "SS_ENUM($(echo $i | tr 'a-z' 'A-Z'));"
-	done
-]
-)
-
-
 AC_MSG_NOTICE(creating error2.h)
+for i in $executables; do
+	echo "$i: "
+	eval echo \$${i}_errlist_objs
+done | ./error2.pl > error2.h
 for obj in $all_errlist_objs; do
 	SS="$SS SS_$(echo $obj | tr 'a-z' 'A-Z'),"
-	echo "#ifdef MAIN_INPUT_FILE_IS_$obj"
-	define_safe_error_enums($obj)
-	echo "#endif"
-done > error2.h
+done
 AC_DEFINE_UNQUOTED(DEFINE_ERRLIST_OBJECT_ENUM,
 	[enum {$SS NUM_SS}],
 	[list of all objects that use paraslash's error facility]
@@ -655,29 +820,24 @@ lyrics_id duration directory lyrics_name image_name path hash channels
 last_played num_chunks chunk_time amplification artist title year album
 comment"
 
-# $1: prefix, $2: items
-AC_DEFUN([make_enum_items], [$(
-	for i in $2; do
-		printf "$1_$(echo $i | tr 'a-z' 'A-Z'), "
-	done
-)])
-
-# $1: prefix, $2: items
-AC_DEFUN([make_enum_array], [$(
-	for i in $2; do
-		printf "\"$i\", "
-	done
-)])
-
-AC_DEFINE_UNQUOTED(STATUS_ITEM_ENUM,
-	make_enum_items(SI,  $status_items),
-	[enum of all status items]
-)
-AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY,
-	make_enum_array(SI,  $status_items),
-	[char * array of all status items]
-)
+result=
+for i in $status_items; do
+	result="$result SI_$(echo $i | tr 'a-z' 'A-Z'), "
+done
+AC_DEFINE_UNQUOTED(STATUS_ITEM_ENUM, [$result],
+	[enum of all status items])
+
+result=
+for i in $status_items; do
+	result="$result \"$i\", "
+done
+AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [$result],
+	[char * array of all status items])
+
+AC_DEFINE_UNQUOTED(SERVER_AUDIO_FORMATS, "$server_audio_formats",
+	[formats supported by para_server and para_afh])
 
+AC_SUBST(executables, add_para($executables))
 
 recv_objs="$recv_cmdline_objs $recv_errlist_objs"
 filter_objs="$filter_cmdline_objs $filter_errlist_objs"
@@ -771,8 +931,6 @@ paraslash configuration:
 unix socket credentials: $have_ucred
 audio formats supported by para_server/para_afh: $server_audio_formats
 id3 version2 support: $have_libid3tag
-senders supported by para_server: $senders
-receivers supported by para_audiod/para_recv: $receivers
 filters supported by para_audiod/para_filter: $filters
 writers supported by para_audiod/para_write: $writers
 optional executables: $extras