Merge branch 't/t0004_fix'

This topic has been cooking for some weeks now and was tested
successfully on all supported operating systems.

diff --combined NEWS
index d9e0d0a377e7fec9c833e5f7a021671ace796214,e5ae590e22605236ada049eb5d758eb293ba901e..5b87555053f907b1226fb1f2867f0d9076206ae9
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -10,7 -10,6 +10,9 @@@
        - The obscure error messages on mmap() failures have been
          replaced by meaningful messages. This affects mainly
          para_afh.
 +      - para_audioc: Cleanups and memory leak fixes.
++      - Test 0004-server no longer fails if para_server is not
++        being built.
  
  -------------------------------------
  0.4.9 (2011-12-06) "hybrid causality"

diff --combined configure.ac
index b5898ac833e10cefabcdc84d398d55a5cd387c83,ac6d53bbbad4d47c5bdffd8b88a06011211eaf9b..224c7be072045d0573f2bbbe269e0a624f4b7c9e
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -92,23 -92,22 +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 +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 +147,8 @@@ client_errlist_objs="client net string 
  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 +264,21 @@@ or execut
  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 +505,12 @@@ if test ${have_core_audio} = yes; the
        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"
@@@ -748,7 -758,7 +758,7 @@@ if test -n "$with_flac_libs"; the
        LDFLAGS="$LDFLAGS $flac_libs"
  fi
  AC_CHECK_HEADER(FLAC/stream_decoder.h, [], have_flac=no)
 -AC_CHECK_LIB([FLAC], [FLAC__stream_decoder_init_file], [], 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"