X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=c90baf79a22b7841416781e991a7a11e09ad7f63;hp=73e97997162e7435c0ad9db22494049904af4b82;hb=00381560b9726b1db7e135409c37364eed6c4fb6;hpb=1e97f6746b605e37826fb6ee2ad35b7b330145d6

diff --git a/configure.ac b/configure.ac
index 73e97997..c90baf79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,7 @@ 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_cmdline],[$(for i in $@; do printf "${i}.cmdline "; 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
@@ -33,11 +34,12 @@ AC_PATH_PROG([help2man], [help2man])
 test -z "$help2man" && AC_MSG_ERROR(
 	[help2man is required to build this package])
 
+AC_PATH_PROG([install], [install])
+test -z "$install" && AC_MSG_ERROR(
+	[The install program is required to build this package])
+
 AC_PROG_CC
 AC_PROG_CPP
-AC_PROG_INSTALL
-AC_SUBST(install_sh, [$INSTALL])
-AC_REPLACE_FNMATCH
 
 AC_HEADER_DIRENT
 AC_HEADER_STDC
@@ -71,11 +73,9 @@ AC_TYPE_UINT64_T
 # Checks for library functions.
 AC_FUNC_FORK
 AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MALLOC
 AC_FUNC_MEMCMP
 AC_FUNC_MKTIME
 AC_FUNC_MMAP
-AC_FUNC_REALLOC
 AC_FUNC_SELECT_ARGTYPES
 AC_FUNC_STAT
 AC_FUNC_STRFTIME
@@ -89,22 +89,16 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \
 	strncasecmp strrchr strspn alarm mkdir inet_ntoa socket], [],
 	[AC_MSG_ERROR([function not found, cannot live without it])])
 
-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 afh play"
+audio_format_handlers="mp3 wma"
 
-executables="recv filter audioc write client afh audiod play"
-
-recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv afh_recv)"
+recv_cmdline_objs="
+	recv
+	http_recv
+	dccp_recv
+	udp_recv
+	afh_recv
+"
 
 recv_errlist_objs="
 	http_recv recv_common recv time string net dccp_recv fd
@@ -114,14 +108,19 @@ recv_errlist_objs="
 
 recv_ldflags=""
 
-filter_cmdline_objs="add_cmdline(filter compress_filter amp_filter prebuffer_filter)"
+filter_cmdline_objs="
+	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 version
 	prebuffer_filter time bitstream imdct wma_common wmadec_filter buffer_tree"
 filter_ldflags="-lm"
 filters=" compress wav amp fecdec wmadec prebuffer"
 
-audioc_cmdline_objs="add_cmdline(audioc)"
+audioc_cmdline_objs="audioc"
 audioc_errlist_objs="
 	audioc
 	string
@@ -132,47 +131,19 @@ audioc_errlist_objs="
 "
 audioc_ldflags=""
 
-audiod_cmdline_objs="add_cmdline(audiod compress_filter http_recv dccp_recv file_write client amp_filter udp_recv prebuffer_filter)"
-audiod_errlist_objs="audiod signal string daemon stat net crypt_common sideband
-	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 fecdec_filter
-	client_common ggo udp_recv color fec prebuffer_filter version
-	bitstream imdct wma_common wmadec_filter buffer_tree"
-audiod_ldflags="-lm"
-audiod_audio_formats="wma"
-
-afh_cmdline_objs="add_cmdline(afh)"
+afh_cmdline_objs="afh"
 afh_errlist_objs="afh string fd mp3_afh afh_common time wma_afh wma_common
 	version ggo"
 afh_ldflags=""
 
-write_cmdline_objs="add_cmdline(write file_write)"
+write_cmdline_objs="write file_write"
 write_errlist_objs="write write_common file_write time fd string sched stdin
 	buffer_tree ggo check_wav version"
 write_ldflags=""
 writers=" file"
 default_writer="FILE_WRITE"
 
-client_cmdline_objs="add_cmdline(client)"
-client_errlist_objs="
-	client
-	net
-	string
-	fd
-	sched
-	stdin
-	stdout
-	time
-	sideband
-	client_common
-	buffer_tree
-	crypt_common
-	version
-	ggo
-"
-client_ldflags=""
-
-gui_cmdline_objs="add_cmdline(gui)"
+gui_cmdline_objs="gui"
 gui_errlist_objs="
 	exec
 	signal
@@ -186,7 +157,6 @@ gui_errlist_objs="
 	version
 	ggo
 "
-gui_objs="$gui_cmdline_objs $gui_errlist_objs"
 play_errlist_objs="play fd sched ggo buffer_tree time string net
 	afh_recv afh_common
 	wma_afh wma_common mp3_afh
@@ -197,89 +167,18 @@ play_errlist_objs="play fd sched ggo buffer_tree time string net
 	write_common file_write
 	version
 "
-play_cmdline_objs="add_cmdline(http_recv dccp_recv udp_recv afh_recv compress_filter amp_filter prebuffer_filter file_write play)"
+play_cmdline_objs="
+	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], [
@@ -319,57 +218,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"
@@ -429,7 +279,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"
@@ -472,7 +321,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"
@@ -485,10 +333,6 @@ if test "$check_gcrypt" = "yes"; then
 else
 	have_gcrypt="no"
 fi
-###########################################################################
-if test "$have_openssl" = "no" -a "$have_gcrypt" = "no"; then
-	AC_MSG_ERROR([neither openssl nor gcrypt usable])
-fi
 ########################################################################### libsocket
 AC_CHECK_LIB([c], [socket],
 	[socket_lib=],
@@ -567,9 +411,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"
@@ -605,13 +450,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"
@@ -694,7 +532,7 @@ if test "$have_ogg" = "yes"; then
 		CPPFLAGS="$CPPFLAGS $opus_cppflags"
 	fi
 	if test -n "$with_opus_libs"; then
-		speex_libs="-L$with_opus_libs"
+		opus_libs="-L$with_opus_libs"
 		LDFLAGS="$LDFLAGS $opus_libs"
 	fi
 	AC_CHECK_LIB([opus], [opus_multistream_decode], [], [ have_opus="no" ])
@@ -721,14 +559,12 @@ if test "$have_vorbis" = "yes" || \
 	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"
@@ -752,7 +588,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"
@@ -776,7 +611,6 @@ else
 	AC_MSG_WARN([no ogg/speex $msg])
 fi
 if test "$have_opus" = "yes"; then
-	all_errlist_objs="$all_errlist_objs opusdec_filter opus_afh opus_common"
 	AC_DEFINE(HAVE_OPUS, 1, define to 1 to turn on ogg/opus support)
 	filters="$filters opusdec"
 	opus_libs="-lopus"
@@ -823,7 +657,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"
@@ -874,10 +707,9 @@ AC_CHECK_LIB([mad], [mad_stream_init], [], [
 ])
 if test "$have_mad" = "yes"; then
 	AC_DEFINE(HAVE_MAD, 1, define to 1 if you want to build the mp3dec filter)
-	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_cmdline_objs="$filter_cmdline_objs mp3dec_filter"
+	audiod_cmdline_objs="$audiod_cmdline_objs mp3dec_filter"
+	play_cmdline_objs="$play_cmdline_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"
@@ -956,7 +788,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"
@@ -968,7 +799,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"
@@ -990,13 +821,12 @@ msg="=> will not build oss writer"
 AC_CHECK_HEADER(sys/soundcard.h, [
 	audiod_errlist_objs="$audiod_errlist_objs oss_write"
 	play_errlist_objs="$play_errlist_objs oss_write"
-	audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(oss_write)"
-	play_cmdline_objs="$play_cmdline_objs add_cmdline(oss_write)"
+	audiod_cmdline_objs="$audiod_cmdline_objs oss_write"
+	play_cmdline_objs="$play_cmdline_objs oss_write"
 
 	write_errlist_objs="$write_errlist_objs oss_write"
-	write_cmdline_objs="$write_cmdline_objs add_cmdline(oss_write)"
+	write_cmdline_objs="$write_cmdline_objs 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"
@@ -1047,18 +877,17 @@ fi
 
 if test "$have_alsa" = "yes"; then
 	audiod_errlist_objs="$audiod_errlist_objs alsa_write"
-	audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(alsa_write)"
+	audiod_cmdline_objs="$audiod_cmdline_objs alsa_write"
 	audiod_ldflags="$audiod_ldflags -lasound"
 	play_errlist_objs="$play_errlist_objs alsa_write"
-	play_cmdline_objs="$play_cmdline_objs add_cmdline(alsa_write)"
+	play_cmdline_objs="$play_cmdline_objs alsa_write"
 	play_ldflags="$play_ldflags -lasound"
 
 	write_errlist_objs="$write_errlist_objs alsa_write"
-	write_cmdline_objs="$write_cmdline_objs add_cmdline(alsa_write)"
+	write_cmdline_objs="$write_cmdline_objs alsa_write"
 	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"
@@ -1071,12 +900,11 @@ 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"
+	fade_cmdline_objs="fade"
+	fade_objs="add_cmdline($fade_cmdline_objs) $fade_errlist_objs"
 	AC_SUBST(fade_objs, add_dot_o($fade_objs))
 	AC_SUBST(fade_ldflags, $fade_ldflags)
 	AC_DEFINE_UNQUOTED(INIT_FADE_ERRLISTS,
@@ -1104,6 +932,7 @@ 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
@@ -1151,17 +980,16 @@ 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_cmdline_objs="$audiod_cmdline_objs ao_write"
 	audiod_ldflags="$audiod_ldflags -lao -lpthread"
 
 	play_errlist_objs="$play_errlist_objs ao_write"
-	play_cmdline_objs="$play_cmdline_objs add_cmdline(ao_write)"
+	play_cmdline_objs="$play_cmdline_objs ao_write"
 	play_ldflags="$play_ldflags -lao -lpthread"
 
 	write_errlist_objs="$write_errlist_objs ao_write"
-	write_cmdline_objs="$write_cmdline_objs add_cmdline(ao_write)"
+	write_cmdline_objs="$write_cmdline_objs ao_write"
 	write_ldflags="$write_ldflags $ao_libs -lao -lpthread"
 	writers="$writers ao"
 	AC_SUBST(ao_cppflags)
@@ -1226,7 +1054,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"
@@ -1264,13 +1091,12 @@ 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)"
+	filter_cmdline_objs="$filter_cmdline_objs resample_filter"
 	audiod_errlist_objs="$audiod_errlist_objs resample_filter check_wav"
-	audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(resample_filter)"
+	audiod_cmdline_objs="$audiod_cmdline_objs resample_filter"
 	play_errlist_objs="$play_errlist_objs resample_filter check_wav"
-	play_cmdline_objs="$play_cmdline_objs add_cmdline(resample_filter)"
+	play_cmdline_objs="$play_cmdline_objs resample_filter"
 	filter_ldflags="$filter_ldflags $samplerate_libs -lsamplerate"
 	audiod_ldflags="$audiod_ldflags $samplerate_libs -lsamplerate"
 	play_ldflags="$play_ldflags $samplerate_libs -lsamplerate"
@@ -1282,8 +1108,169 @@ 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="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
+############################################################# client
+if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
+	build_client="yes"
+	executables="$executables client"
+	client_cmdline_objs="client"
+	client_errlist_objs="$client_errlist_objs
+		client
+		net
+		string
+		fd
+		sched
+		stdin
+		stdout
+		time
+		sideband
+		client_common
+		buffer_tree
+		crypt_common
+		version
+		ggo
+	"
+else
+	build_client="no"
+fi
+############################################################# audiod
+if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then
+	build_audiod="yes"
+	executables="$executables audiod"
+	audiod_cmdline_objs="$audiod_cmdline_objs
+		audiod
+		compress_filter
+		http_recv
+		dccp_recv
+		file_write
+		client
+		amp_filter
+		udp_recv
+		prebuffer_filter
+	"
+	audiod_errlist_objs="$audiod_errlist_objs
+		audiod
+		signal
+		string
+		daemon
+		stat
+		net
+		crypt_common
+		sideband
+		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
+		fecdec_filter
+		client_common
+		ggo
+		udp_recv
+		color
+		fec
+		prebuffer_filter
+		version
+		bitstream
+		imdct
+		wma_common
+		wmadec_filter
+		buffer_tree
+	"
+	audiod_ldflags="$audiod_ldflags -lm"
+	audiod_audio_formats="$audiod_audio_formats wma"
+else
+	build_audiod="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
+	$afh_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
+if test "$build_client" = "yes"; then
+	all_errlist_objs="$all_errlist_objs $client_errlist_objs"
+fi
+if test "$build_audiod" = "yes"; then
+	all_errlist_objs="$all_errlist_objs $audiod_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
@@ -1325,16 +1312,16 @@ AC_DEFINE_UNQUOTED(AUDIO_FORMAT_HANDLERS, "$audio_format_handlers",
 
 AC_SUBST(executables)
 
-recv_objs="$recv_cmdline_objs $recv_errlist_objs"
-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"
-afh_objs="$afh_cmdline_objs $afh_errlist_objs"
-play_objs="$play_cmdline_objs $play_errlist_objs"
-
+recv_objs="add_cmdline($recv_cmdline_objs) $recv_errlist_objs"
+filter_objs="add_cmdline($filter_cmdline_objs) $filter_errlist_objs"
+audiod_objs="add_cmdline($audiod_cmdline_objs) $audiod_errlist_objs"
+server_objs="add_cmdline($server_cmdline_objs) $server_errlist_objs"
+write_objs="add_cmdline($write_cmdline_objs) $write_errlist_objs"
+client_objs="add_cmdline($client_cmdline_objs) $client_errlist_objs"
+audioc_objs="add_cmdline($audioc_cmdline_objs) $audioc_errlist_objs"
+afh_objs="add_cmdline($afh_cmdline_objs) $afh_errlist_objs"
+play_objs="add_cmdline($play_cmdline_objs) $play_errlist_objs"
+gui_objs="add_cmdline($gui_cmdline_objs) $gui_errlist_objs"
 
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
 AC_SUBST(recv_ldflags, $recv_ldflags)
@@ -1421,6 +1408,11 @@ 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
+para_client: $build_client
+para_audiod: $build_audiod
 ])