From 43beae8f9bbba5f63bca91b9f9d1e6320c937005 Mon Sep 17 00:00:00 2001
From: Andre Noll <maan@systemlinux.org>
Date: Sun, 5 Feb 2012 14:18:11 +0100
Subject: [PATCH] configure.ac: Do not include server-only objects
 unconditionally.

We included the list of server-only objects in $all_errlist_objs
even if para_server is not going to be built (because libosl was
not found). This confuses t0004-server which bases the decision
whether it should skip its tests on whether server.o is contained
in $all_errlist_objs.

So add these objects to $all_errlist_objs only if libosl is detected.
---
 configure.ac | 49 ++++++++++++++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/configure.ac b/configure.ac
index a5035401..ac6d53bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,16 +92,15 @@ AC_SUBST(cmdline_dir)
 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 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 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 imdct wma_afh
-wma_common wmadec_filter buffer_tree crypt_common gui gui_theme
-"
+all_errlist_objs="mp3_afh afh_common net string signal time daemon
+	stat afh fade 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 audiod_command_list bitstream imdct
+	wma_afh wma_common wmadec_filter buffer_tree crypt_common
+	gui gui_theme"
 
 executables="recv filter audioc write client afh audiod"
 
@@ -135,15 +134,6 @@ afh_cmdline_objs="add_cmdline(afh)"
 afh_errlist_objs="afh string fd mp3_afh afh_common time wma_afh wma_common"
 afh_ldflags=""
 
-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
-	server_command_list afs_command_list wma_afh wma_common"
-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
 	buffer_tree ggo"
@@ -274,6 +264,21 @@ or execute
 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 server_command_list
+		afs_command_list wma_afh wma_common"
+
+	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_command_list afs_command_list"
+
+	server_ldflags=""
+	server_audio_formats="mp3 wma"
 	AC_SUBST(osl_cppflags)
 	server_ldflags="$server_ldflags $osl_libs -losl"
 fi
@@ -500,6 +505,12 @@ if test ${have_core_audio} = yes; then
 	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"
-- 
2.30.2