Merge branch 'master' into my-osx

diff --combined configure.ac
index 81d1cbba04e4ffc08341cee2528c0313f22bc7b2,edb0637aeffdf3b65aa533586fb81fedfc5e4a69..855c17d5c96b81ee472ff7bf6b31a8a5ad8aafb6
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -68,10 -68,11 +68,11 @@@ audioc_cmdline_objs="audioc.cmdline
  audioc_errlist_objs="audioc string net fd"
  
  audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline
-       http_recv.cmdline dccp_recv.cmdline file_write.cmdline"
- audiod_errlist_objs="audiod exec close_on_fork signal string daemon stat net
+       http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline"
+ audiod_errlist_objs="audiod signal string daemon stat net
        time grab_client filter_chain wav compress http_recv dccp dccp_recv
-       recv_common fd sched write_common file_writer audiod_command"
+       recv_common fd sched write_common file_writer audiod_command crypt
+       client_common"
  audiod_ldflags=""
  
  server_cmdline_objs="server.cmdline"
@@@ -137,6 -138,7 +138,7 @@@ if test "$enable_ssldir" = "yes"; then 
  CHECK_SSL($enable_ssldir)
  server_ldflags="$srver_ldflags $SSL_LDFLAGS $SSL_LIBS"
  client_ldflags="$client_ldflags $SSL_LDFLAGS $SSL_LIBS"
+ audiod_ldflags="$audiod_ldflags $SSL_LDFLAGS $SSL_LIBS"
  
  ########################################################################### ucred
  
@@@ -152,31 -154,6 +154,31 @@@ if test ${have_ucred} = yes; the
        AC_DEFINE(HAVE_UCRED, 1, define to 1 you have struct ucred)
  fi
  
 +########################################################################### osx
 +
 +AC_MSG_CHECKING(for CoreAudio (MacOs))
 +AC_TRY_LINK([
 +      #include <CoreAudio/CoreAudio.h>
 +],[
 +      AudioDeviceID id;
 +],[have_core_audio=yes],[have_core_audio=no])
 +AC_MSG_RESULT($have_core_audio)
 +if test ${have_core_audio} = yes; then
 +      f1="-framework CoreAudio"
 +      f2="-framework AudioToolbox"
 +      f3="-framework AudioUnit"
 +      f4="-framework CoreServices"
 +      f="$f1 $f2 $f3 $f4"
 +      audiod_errlist_objs="$audiod_errlist_objs osx_writer"
 +      audiod_cmdline_objs="$audiod_cmdline_objs osx_write.cmdline"
 +      audiod_ldflags="$audiod_ldflags $f"
 +
 +      write_errlist_objs="$write_errlist_objs osx_writer"
 +      write_cmdline_objs="$write_cmdline_objs osx_write.cmdline"
 +      write_ldflags="$write_ldflags $f"
 +      write_writers="$write_writers osx"
 +      AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on MacOs)
 +fi
  ########################################################################### gtk2
  
  pkg_modules="gtk+-2.0 >= 2.0.0"