Merge commit 'meins/next' into next

diff --combined configure.ac
index 2da62d6c781f20a25d79488ed135202ea8ac0bf5,5f39c24549796c22a125d58e14fe331afc654986..6557deaaf5c88defcab91df7c52d2db4659e40a2
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -84,7 -84,7 +84,7 @@@ dccp_send fd user_list chunk_queue afs 
  playlist sha1 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"
+ udp_recv udp_send color fec fecdec_filter prebuffer_filter mm"
  
  all_executables="server recv filter audioc write client afh"
  
@@@ -125,7 -125,7 +125,7 @@@ afh_ldflags="
  
  server_cmdline_objs="server.cmdline server_command_list afs_command_list"
  server_errlist_objs="server afh_common mp3_afh vss command net string signal
-       time daemon crypt http_send close_on_fork
+       time daemon crypt http_send close_on_fork mm
        ipc dccp_send fd user_list chunk_queue afs aft mood score attribute
        blob playlist sha1 sched acl send_common udp_send color fec"
  server_ldflags="-losl"
@@@ -153,22 -153,6 +153,22 @@@ fade_errlist_objs="fade exec string fd
  
  ########################################################################### osl
  have_osl=yes
 +OLD_CPPFLAGS="$CPPFLAGS"
 +OLD_LD_FLAGS="$LDFLAGS"
 +OLD_LIBS="$LIBS"
 +AC_ARG_WITH(osl_headers, [AC_HELP_STRING(--with-osl-headers=dir,
 +      [look for osl.h also in dir])])
 +if test -n "$with_osl_headers"; then
 +      osl_cppflags="-I$with_osl_headers"
 +      CPPFLAGS="$CPPFLAGS $osl_cppflags"
 +fi
 +AC_ARG_WITH(osl_libs, [AC_HELP_STRING(--with-osl-libs=dir,
 +      [look for libosl also in dir])])
 +if test -n "$with_osl_lib"; then
 +      osl_libs="-L$with_osl_lib"
 +      LDFLAGS="$LDFLAGS $osl_libs"
 +fi
 +
  AC_CHECK_HEADER(osl.h, [], have_osl=no)
  AC_CHECK_LIB([osl], [osl_open_table], [], have_osl=no)
  if test "$have_osl" = "no"; then
@@@ -178,11 -162,6 +178,11 @@@ Install the library wit
        (cd osl && make && sudo make install)
        ])
  fi
 +AC_SUBST(osl_cppflags)
 +server_ldflags="$server_ldflags -L$with_osl_lib"
 +CPPFLAGS="$OLD_CPPFLAGS"
 +LDFLAGS="$OLD_LDFLAGS"
 +LIBS="$OLD_LIBS"
  ########################################################################### ssl
  dnl @synopsis CHECK_SSL
  dnl