X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=224c7be072045d0573f2bbbe269e0a624f4b7c9e;hp=b5898ac833e10cefabcdc84d398d55a5cd387c83;hb=3367017659e639aa8925ff4c607f1d41d24e657e;hpb=0703f75a276020f9645f987134d49402f7c019c0

diff --git a/configure.ac b/configure.ac
index b5898ac8..224c7be0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,23 +92,22 @@ 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
-"
+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"
 
 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 buffer_tree"
+	fd sched stdout ggo udp_recv buffer_tree"
 recv_ldflags=""
 
 filter_cmdline_objs="add_cmdline(filter compress_filter amp_filter prebuffer_filter)"
@@ -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"
@@ -157,9 +147,8 @@ client_errlist_objs="client net string fd sched stdin stdout time
 client_ldflags=""
 
 gui_cmdline_objs="add_cmdline(gui)"
-gui_errlist_objs="exec signal string stat ringbuffer fd"
-gui_other_objs="gui gui_theme"
-gui_objs="$gui_cmdline_objs $gui_errlist_objs $gui_other_objs"
+gui_errlist_objs="exec signal string stat ringbuffer fd gui gui_theme"
+gui_objs="$gui_cmdline_objs $gui_errlist_objs"
 
 fade_cmdline_objs="add_cmdline(fade)"
 fade_errlist_objs="fade exec string fd"
@@ -275,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
@@ -501,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"