Merge commit 'meins/master'

diff --combined configure.ac
index f62a2038a1524d49ea5c7926c9aaa593dcdab1f6,04a4e934c6ab7b2d90d9d9825ac30e4f13c431aa..62223839a82d9ce85d00e08e3f0e95b256d8c67b
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -83,7 -83,7 +83,7 @@@ daemon stat crypt http_send close_on_fo
  dccp_send fd user_list chunk_queue afs osl aft mood score attribute blob ringbuffer
  playlist sha1 rbtree 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 fsck exec send_common"
+ client_common recv stdout filter stdin audioc write client fsck exec send_common ggo"
  
  all_executables="server recv filter audioc write client fsck afh"
  
@@@ -96,7 -96,7 +96,7 @@@ receivers=" http dccp
  senders=" http dccp"
  
  filter_cmdline_objs="filter.cmdline compress_filter.cmdline amp_filter.cmdline"
- filter_errlist_objs="filter_common wav_filter compress_filter filter string stdin stdout sched fd amp_filter"
+ filter_errlist_objs="filter_common wav_filter compress_filter filter string stdin stdout sched fd amp_filter ggo"
  filter_ldflags=""
  filters=" compress wav amp"
  
@@@ -110,7 -110,7 +110,7 @@@ audiod_cmdline_objs="audiod.cmdline gra
  audiod_errlist_objs="audiod signal string daemon stat net
        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 crypt
-       client_common"
+       client_common ggo"
  audiod_ldflags=""
  audiod_audio_formats=""
  
@@@ -127,7 -127,7 +127,7 @@@ server_ldflags="
  server_audio_formats=" mp3"
  
  write_cmdline_objs="write.cmdline file_write.cmdline"
- write_errlist_objs="write write_common file_write time fd string sched stdin"
+ write_errlist_objs="write write_common file_write time fd string sched stdin ggo"
  write_ldflags=""
  writers=" file"
  default_writer="FILE_WRITE"
@@@ -366,6 -366,8 +366,6 @@@ AC_CHECK_HEADER(neaacdec.h, [], have_fa
  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)
 -      filter_cmdline_objs="$filter_cmdline_objs mp3dec_filter.cmdline"
 -      audiod_cmdline_objs="$audiod_cmdline_objs mp3dec_filter.cmdline"
        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"
@@@ -412,8 -414,6 +412,8 @@@ 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 mp3dec_filter.cmdline"
 +      audiod_cmdline_objs="$audiod_cmdline_objs mp3dec_filter.cmdline"
        all_errlist_objs="$all_errlist_objs mp3dec_filter"
        filter_errlist_objs="$filter_errlist_objs mp3dec_filter"
        audiod_errlist_objs="$audiod_errlist_objs mp3dec_filter"