Merge commit 'remotes/lamarck/master'

diff --combined configure.ac
index e7ae6b316e6c25e9ceb4723743a2cd19dc65e3f7,5036ce1ff4fa07d872114b05df3e53426f3ca29c..013e7b4ae577f3ebc41037a4e0854669838e866a
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -324,7 -324,7 +324,7 @@@ if test "$have_ogg" = "yes"; the
        server_ldflags="$server_ldflags $oggvorbis_libs -logg -lvorbis -lvorbisfile"
        filter_ldflags="$filter_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
        audiod_ldflags="$audiod_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
-       afh_ldflags="$afh_ldflags $oggvorbis_libs -lvorbis -lvorbisfile"
+       afh_ldflags="$afh_ldflags $oggvorbis_libs -logg -lvorbis -lvorbisfile"
  
        filter_cmdline_objs="$filter_cmdline_objs oggdec_filter.cmdline"
        audiod_cmdline_objs="$audiod_cmdline_objs oggdec_filter.cmdline"
@@@ -714,8 -714,8 +714,8 @@@ AC_MSG_NOTICE(
  paraslash configuration:
  ~~~~~~~~~~~~~~~~~~~~~~~~
  unix socket credentials: $have_ucred
 -audio formats supported by para_server: $server_audio_formats
 -senders supported by para_server/para_send: $senders
 +audio formats supported by para_server/para_afh: $server_audio_formats
 +senders supported by para_server: $senders
  receivers supported by para_audiod/para_recv: $receivers
  filters supported by para_audiod/para_filter: $filters
  writers supported by para_audiod/para_write: $writers