X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=00ff019f510b43a701932c617ccb271e96b7f8a1;hp=3a0a36f62f002a9bf19d3d9e66d495fc27b942b0;hb=17ed11f03c1f9bbc5fc5c4b6f81a23afd7dadb67;hpb=042767ce4032ee7bec7df1716411a175259cfbf1

diff --git a/configure.ac b/configure.ac
index 3a0a36f6..00ff019f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,13 +3,11 @@
 
 AC_PREREQ([2.61])
 
-
 AC_INIT([paraslash],[git],[maan@systemlinux.org])
 AC_CONFIG_HEADER([config.h])
 
 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) }])
 AC_PATH_PROG(UNAMEPATH, uname, no)
 if test "$UNAMEPATH" = "no"; then
@@ -94,17 +92,8 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
 AC_DEFUN([add_cmdline],[$(for i in $@; do printf "${i}.cmdline "; done)])
 
 
-all_errlist_objs="mp3_afh afh_common net string signal time daemon
-	stat afh amp_filter fd ringbuffer 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 color fec fecdec_filter
-	prebuffer_filter bitstream imdct check_wav
-	wma_afh wma_common wmadec_filter buffer_tree crypt_common
-	gui gui_theme sideband afh_recv play version"
-
 executables="recv filter audioc write client afh audiod play"
+audio_format_handlers="mp3 wma"
 
 recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv afh_recv)"
 
@@ -201,87 +190,6 @@ play_errlist_objs="play fd sched ggo buffer_tree time string net
 "
 play_cmdline_objs="add_cmdline(http_recv dccp_recv udp_recv afh_recv compress_filter amp_filter prebuffer_filter file_write play)"
 play_ldflags="-lm"
-########################################################################### 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_RUN_IFELSE([AC_LANG_SOURCE([[
-#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_RUN_IFELSE([AC_LANG_SOURCE([[#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()
 ################################################################## clock_gettime
 clock_gettime_lib=
 AC_CHECK_LIB([c], [clock_gettime], [clock_gettime_lib=c], [
@@ -297,7 +205,7 @@ fi
 ########################################################################### osl
 have_osl=yes
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 AC_ARG_WITH(osl_headers, [AS_HELP_STRING(--with-osl-headers=dir,
 	[look for osl.h also in dir])])
@@ -321,57 +229,8 @@ Download libosl at
 or execute
 	git clone git://git.tuebingen.mpg.de/osl
 	])
-else
-	extras="$extras server"
-	executables="$executables server"
-	server_cmdline_objs="add_cmdline(server)"
-	server_errlist_objs="
-		server
-		afh_common
-		mp3_afh
-		vss command
-		net
-		string
-		signal
-		time
-		daemon
-		http_send
-		close_on_fork
-		mm
-		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
-		wma_afh
-		wma_common
-		sideband
-		version
-		ggo
-	"
-	all_errlist_objs="$all_errlist_objs server vss command
-		http_send close_on_fork mm ipc dccp_send user_list
-		chunk_queue afs aft mood score attribute blob playlist
-		acl udp_send"
-
-	server_ldflags=""
-	audio_format_handlers="mp3 wma"
-	AC_SUBST(osl_cppflags)
-	server_ldflags="$server_ldflags $osl_libs -losl"
 fi
+AC_SUBST(osl_cppflags)
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
@@ -392,7 +251,7 @@ esac
 ###################################################################### openssl
 if test "$check_openssl" = "yes"; then
 	OLD_CPPFLAGS="$CPPFLAGS"
-	OLD_LD_FLAGS="$LDFLAGS"
+	OLD_LDFLAGS="$LDFLAGS"
 	OLD_LIBS="$LIBS"
 	have_openssl="yes"
 	AC_ARG_WITH(openssl_headers, [AS_HELP_STRING(--with-openssl-headers=dir,
@@ -431,7 +290,6 @@ if test "$check_openssl" = "yes"; then
 		client_ldflags="$client_ldflags $openssl_libs"
 		audiod_ldflags="$audiod_ldflags $openssl_libs"
 
-		all_errlist_objs="$all_errlist_objs crypt"
 		server_errlist_objs="$server_errlist_objs crypt"
 		client_errlist_objs="$client_errlist_objs crypt"
 		audiod_errlist_objs="$audiod_errlist_objs crypt"
@@ -449,7 +307,7 @@ fi
 ########################################################################### gcrypt
 if test "$check_gcrypt" = "yes"; then
 	OLD_CPPFLAGS="$CPPFLAGS"
-	OLD_LD_FLAGS="$LDFLAGS"
+	OLD_LDFLAGS="$LDFLAGS"
 	OLD_LIBS="$LIBS"
 	have_gcrypt="yes"
 	AC_ARG_WITH(gcrypt_headers, [AS_HELP_STRING(--with-gcrypt-headers=dir,
@@ -474,7 +332,6 @@ if test "$check_gcrypt" = "yes"; then
 		client_ldflags="$client_ldflags $gcrypt_libs"
 		audiod_ldflags="$audiod_ldflags $gcrypt_libs"
 
-		all_errlist_objs="$all_errlist_objs gcrypt"
 		server_errlist_objs="$server_errlist_objs gcrypt"
 		client_errlist_objs="$client_errlist_objs gcrypt"
 		audiod_errlist_objs="$audiod_errlist_objs gcrypt"
@@ -541,7 +398,7 @@ AC_SUBST(ggo_descriptions_declared)
 ########################################################################### curses
 have_curses="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 AC_ARG_WITH(curses_headers, [AS_HELP_STRING(--with-curses-headers=dir,
 	[look for curses.h also in dir])])
@@ -569,9 +426,10 @@ AC_CHECK_LIB([ncursesw], [initscr],
 )
 if test "$have_curses" = "yes"; then
 	AC_SUBST(curses_cppflags)
-	extras="$extras gui"
+	build_gui="yes"
 	executables="$executables gui"
 else
+	build_gui="no"
 	AC_MSG_WARN([no curses lib, cannot build para_gui])
 fi
 CPPFLAGS="$OLD_CPPFLAGS"
@@ -607,13 +465,6 @@ if test ${have_core_audio} = yes; then
 	f4="-framework CoreServices"
 	f="$f1 $f2 $f3 $f4"
 
-	all_errlist_objs="$all_errlist_objs osx_write"
-	# ipc is linked into para_server server and into the osx writer. If osl
-	# was not found, para_server will not be built and ipc has not yet been
-	# added to the list of all objects, so we must add it here.
-	if test "$have_osl" = "no"; then
-		all_errlist_objs="$all_errlist_objs ipc"
-	fi
 	audiod_errlist_objs="$audiod_errlist_objs osx_write ipc"
 	audiod_cmdline_objs="$audiod_cmdline_objs osx_write.cmdline"
 	audiod_ldflags="$audiod_ldflags $f"
@@ -629,10 +480,10 @@ 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/vorbis/speex
+####################################################### ogg/vorbis/speex/opus
 have_ogg="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 AC_ARG_WITH(ogg_headers, [AS_HELP_STRING(--with-ogg-headers=dir,
 	[look for ogg headers also in dir])])
@@ -646,6 +497,10 @@ AC_ARG_WITH(speex_headers, [AS_HELP_STRING(--with-speex-headers=dir,
 	[look for speex headers also in dir])])
 AC_ARG_WITH(speex_libs, [AS_HELP_STRING(--with-speex-libs=dir,
 	[look for speex libs also in dir])])
+AC_ARG_WITH(opus_headers, [AS_HELP_STRING(--with-opus-headers=dir,
+	[look for opus headers also in dir])])
+AC_ARG_WITH(opus_libs, [AS_HELP_STRING(--with-opus-libs=dir,
+	[look for opus libs also in dir])])
 
 if test -n "$with_ogg_headers"; then
 	ogg_cppflags="-I$with_ogg_headers"
@@ -660,6 +515,7 @@ AC_CHECK_LIB([ogg], [ogg_stream_init], [], [ have_ogg="no" ])
 
 have_vorbis="yes"
 have_speex="yes"
+have_opus="yes"
 if test "$have_ogg" = "yes"; then
 	# vorbis
 	if test -n "$with_vorbis_headers"; then
@@ -684,14 +540,29 @@ if test "$have_ogg" = "yes"; then
 	fi
 	AC_CHECK_LIB([speex], [speex_decoder_init], [], [ have_speex="no" ])
 	AC_CHECK_HEADERS([speex/speex.h], [], [ have_speex="no" ])
+
+	# opus
+	if test -n "$with_opus_headers"; then
+		opus_cppflags="-I$with_opus_headers"
+		CPPFLAGS="$CPPFLAGS $opus_cppflags"
+	fi
+	if test -n "$with_opus_libs"; then
+		opus_libs="-L$with_opus_libs"
+		LDFLAGS="$LDFLAGS $opus_libs"
+	fi
+	AC_CHECK_LIB([opus], [opus_multistream_decode], [], [ have_opus="no" ])
+	AC_CHECK_HEADERS([opus/opus.h], [], [ have_opus="no" ])
 else
-	AC_MSG_WARN([vorbis/speex depend on libogg, which was not detected])
+	AC_MSG_WARN([vorbis/speex/opus depend on libogg, which was not detected])
 	have_vorbis="no"
 	have_speex="no"
+	have_opus="no"
 fi
 
 msg="support in para_server/para_filter/para_afh"
-if test "$have_vorbis" = "yes" || test "$have_speex" = "yes"; then
+if test "$have_vorbis" = "yes" || \
+		test "$have_speex" = "yes" || \
+		test "$have_opus" = "yes"; then
 	AC_SUBST(ogg_cppflags)
 	ogg_libs="$ogg_libs -logg"
 	if test "$OSTYPE" = "Darwin"; then
@@ -703,14 +574,12 @@ if test "$have_vorbis" = "yes" || test "$have_speex" = "yes"; then
 	play_ldflags="$play_ldflags $ogg_libs"
 	afh_ldflags="$afh_ldflags $ogg_libs"
 	recv_ldflags="$recv_ldflags $ogg_libs"
-	all_errlist_objs="$all_errlist_objs ogg_afh_common"
 	afh_errlist_objs="$afh_errlist_objs ogg_afh_common"
 	recv_errlist_objs="$recv_errlist_objs ogg_afh_common"
 	server_errlist_objs="$server_errlist_objs ogg_afh_common"
 	play_errlist_objs="$play_errlist_objs ogg_afh_common"
 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"
@@ -734,7 +603,6 @@ else
 	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"
@@ -757,13 +625,36 @@ if test "$have_speex" = "yes"; then
 else
 	AC_MSG_WARN([no ogg/speex $msg])
 fi
+if test "$have_opus" = "yes"; then
+	AC_DEFINE(HAVE_OPUS, 1, define to 1 to turn on ogg/opus support)
+	filters="$filters opusdec"
+	opus_libs="-lopus"
+	server_ldflags="$server_ldflags $opus_libs"
+	filter_ldflags="$filter_ldflags $opus_libs"
+	audiod_ldflags="$audiod_ldflags $opus_libs"
+	afh_ldflags="$afh_ldflags $opus_libs"
+	play_ldflags="$play_ldflags $opus_libs"
+	recv_ldflags="$recv_ldflags $opus_libs"
+
+	server_errlist_objs="$server_errlist_objs opus_afh opus_common"
+	filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common"
+	audiod_errlist_objs="$audiod_errlist_objs opusdec_filter opus_common"
+	afh_errlist_objs="$afh_errlist_objs opus_afh opus_common"
+	play_errlist_objs="$play_errlist_objs opusdec_filter opus_afh opus_common"
+	recv_errlist_objs="$recv_errlist_objs opus_afh opus_common"
+
+	audiod_audio_formats="$audiod_audio_formats opus"
+	audio_format_handlers="$audio_format_handlers opus"
+else
+	AC_MSG_WARN([no ogg/opus $msg])
+fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 ########################################################################### faad
 have_faad=yes
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 AC_ARG_WITH(faad_headers, [AS_HELP_STRING(--with-faad-headers=dir,
 	[look for neaacdec.h also in dir])])
@@ -781,7 +672,6 @@ 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)
-	all_errlist_objs="$all_errlist_objs aac_common aacdec_filter aac_afh"
 	filter_errlist_objs="$filter_errlist_objs aacdec_filter aac_common"
 	afh_errlist_objs="$afh_errlist_objs aac_common aac_afh"
 	audiod_errlist_objs="$audiod_errlist_objs aacdec_filter aac_common"
@@ -809,7 +699,7 @@ LIBS="$OLD_LIBS"
 ########################################################################### mad
 have_mad="yes"
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
 AC_ARG_WITH(mad_headers, [AS_HELP_STRING(--with-mad-headers=dir,
@@ -835,7 +725,6 @@ if test "$have_mad" = "yes"; then
 	filter_cmdline_objs="$filter_cmdline_objs add_cmdline(mp3dec_filter)"
 	audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(mp3dec_filter)"
 	play_cmdline_objs="$play_cmdline_objs add_cmdline(mp3dec_filter)"
-	all_errlist_objs="$all_errlist_objs mp3dec_filter"
 	filter_errlist_objs="$filter_errlist_objs mp3dec_filter"
 	audiod_errlist_objs="$audiod_errlist_objs mp3dec_filter"
 	play_errlist_objs="$play_errlist_objs mp3dec_filter"
@@ -853,7 +742,7 @@ LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 ###################################################################### libid3tag
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
 have_libid3tag="yes"
@@ -894,7 +783,7 @@ LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 ########################################################################### flac
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
 have_flac="yes"
@@ -914,7 +803,6 @@ AC_CHECK_HEADER(FLAC/stream_decoder.h, [], have_flac=no)
 AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [], have_flac=no, -logg -lm)
 if test "$have_flac" = "yes"; then
 	AC_DEFINE(HAVE_FLAC, 1, define to 1 if you want to build the flacdec filter)
-	all_errlist_objs="$all_errlist_objs flacdec_filter flac_afh"
 	filter_errlist_objs="$filter_errlist_objs flacdec_filter"
 	audiod_errlist_objs="$audiod_errlist_objs flacdec_filter"
 	play_errlist_objs="$play_errlist_objs flacdec_filter flac_afh"
@@ -926,7 +814,7 @@ if test "$have_flac" = "yes"; then
 	play_ldflags="$play_ldflags $flac_libs -lFLAC"
 	server_ldflags="$server_ldflags $flac_libs -lFLAC"
 	afh_ldflags="$afh_ldflags $flac_libs -lFLAC"
-	recv_ldflags="$afh_ldflags $flac_libs -lFLAC"
+	recv_ldflags="$recv_ldflags $flac_libs -lFLAC"
 	filters="$filters flacdec"
 	audio_format_handlers="$audio_format_handlers flac"
 	audiod_audio_formats="$audiod_audio_formats flac"
@@ -939,7 +827,7 @@ LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 ########################################################################### oss
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
 have_oss="yes"
@@ -954,7 +842,6 @@ AC_CHECK_HEADER(sys/soundcard.h, [
 	write_errlist_objs="$write_errlist_objs oss_write"
 	write_cmdline_objs="$write_cmdline_objs add_cmdline(oss_write)"
 	fade_errlist_objs="$fade_errlist_objs oss_mix"
-	all_errlist_objs="$all_errlist_objs oss_write oss_mix"
 
 	writers="$writers oss"
 	default_writer="OSS_WRITE"
@@ -980,7 +867,7 @@ LIBS="$OLD_LIBS"
 
 ########################################################################### alsa
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
 msg="=> no alsa support for para_audiod/para_write"
@@ -1016,7 +903,6 @@ if test "$have_alsa" = "yes"; then
 	write_ldflags="$write_ldflags -lasound"
 	fade_errlist_objs="$fade_errlist_objs alsa_mix"
 	fade_ldflags="$fade_ldflags -lasound"
-	all_errlist_objs="$all_errlist_objs alsa_write alsa_mix"
 
 	writers="$writers alsa"
 	default_writer="ALSA_WRITE"
@@ -1029,9 +915,8 @@ LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 ########################################################################### fade
 if test -n "$mixers"; then
-	extras="$extras fade"
+	build_fade="yes"
 	executables="$executables fade"
-	all_errlist_objs="$all_errlist_objs fade"
 	fade_errlist_objs="$fade_errlist_objs fade exec string fd version ggo"
 	fade_cmdline_objs="add_cmdline(fade)"
 	fade_objs="$fade_cmdline_objs $fade_errlist_objs"
@@ -1062,12 +947,13 @@ if test -n "$mixers"; then
 	AC_DEFINE_UNQUOTED(MIXER_ARRAY, $array, array of supported mixers)
 	mixer_summary="supported mixers:: $mixers, default: $default_mixer"
 else
+	build_fade="no"
 	AC_MSG_WARN([no mixer support])
 	mixer_summary="para_fade: no"
 fi
 ########################################################################### libao
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
 have_ao="yes"
@@ -1109,7 +995,6 @@ if test "$have_ao" = "yes"; then
 	])
 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"
@@ -1130,7 +1015,7 @@ LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 ############################################################# readline
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
 have_readline="yes"
@@ -1184,7 +1069,6 @@ if test "$have_readline" = "yes"; then
 fi
 
 if test "$have_readline" = "yes"; then
-	all_errlist_objs="$all_errlist_objs interactive"
 	client_errlist_objs="$client_errlist_objs interactive"
 	client_ldflags="$client_ldflags $readline_libs"
 	audioc_errlist_objs="$audioc_errlist_objs buffer_tree interactive sched time"
@@ -1201,7 +1085,7 @@ LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
 ############################################################# libsamplerate
 OLD_CPPFLAGS="$CPPFLAGS"
-OLD_LD_FLAGS="$LDFLAGS"
+OLD_LDFLAGS="$LDFLAGS"
 OLD_LIBS="$LIBS"
 
 have_samplerate="yes"
@@ -1222,7 +1106,6 @@ AC_CHECK_HEADER(samplerate.h, [], have_samplerate=no)
 AC_CHECK_LIB([samplerate], [src_process], [], have_samplerate=no, [])
 
 if test "$have_samplerate" = "yes"; then
-	all_errlist_objs="$all_errlist_objs resample_filter"
 	filter_errlist_objs="$filter_errlist_objs resample_filter check_wav"
 	filter_cmdline_objs="$filter_cmdline_objs add_cmdline(resample_filter)"
 	audiod_errlist_objs="$audiod_errlist_objs resample_filter check_wav"
@@ -1240,8 +1123,84 @@ fi
 CPPFLAGS="$OLD_CPPFLAGS"
 LDFLAGS="$OLD_LDFLAGS"
 LIBS="$OLD_LIBS"
+######################################################################### server
+if test \( "$have_openssl" = "yes" -o "$have_gcrypt" = "yes" \) \
+	-a "$have_osl" = "yes" ; then
+
+	build_server="yes"
+	executables="$executables server"
+	server_cmdline_objs="add_cmdline(server)"
+	server_errlist_objs="$server_errlist_objs
+		server
+		afh_common
+		mp3_afh
+		vss
+		command
+		net
+		string
+		signal
+		time
+		daemon
+		http_send
+		close_on_fork
+		mm
+		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
+		wma_afh
+		wma_common
+		sideband
+		version
+		ggo
+	"
+	server_ldflags="$server_ldflags $osl_libs -losl"
+else
+	build_server="no"
+fi
 ############################################################# error2.h
 AC_MSG_NOTICE(creating error2.h)
+
+# these are always built
+all_errlist_objs="
+	$recv_errlist_objs
+	$filter_errlist_objs
+	$audioc_errlist_objs
+	$write_errlist_objs
+	$client_errlist_objs
+	$afh_errlist_objs
+	$audiod_errlist_objs
+	$play_errlist_objs
+"
+
+# optional executables
+if test "$build_server" = "yes"; then
+	all_errlist_objs="$all_errlist_objs $server_errlist_objs"
+fi
+if test "$build_gui" = "yes"; then
+	all_errlist_objs="$all_errlist_objs $gui_errlist_objs"
+fi
+if test "$build_fade" = "yes"; then
+	all_errlist_objs="$all_errlist_objs $fade_errlist_objs"
+fi
+
+all_errlist_objs="$(echo $all_errlist_objs | tr ' ' '\n' | sort | uniq)"
+
 for i in $executables; do
 	echo "$i: "
 	eval echo \$${i}_errlist_objs
@@ -1281,7 +1240,7 @@ AC_DEFINE_UNQUOTED(STATUS_ITEM_ARRAY, [$result],
 AC_DEFINE_UNQUOTED(AUDIO_FORMAT_HANDLERS, "$audio_format_handlers",
 	[formats supported by para_server and para_afh])
 
-AC_SUBST(executables, add_para($executables))
+AC_SUBST(executables)
 
 recv_objs="$recv_cmdline_objs $recv_errlist_objs"
 filter_objs="$filter_cmdline_objs $filter_errlist_objs"
@@ -1379,6 +1338,9 @@ audio formats handlers: $audio_format_handlers
 id3 version2 support: $have_libid3tag
 filters: $filters
 writers: $writers
-optional executables: $extras
+
 $mixer_summary
+para_server: $build_server
+para_gui: $build_gui
+para_fade: $build_fade
 ])