Merge branch 'master' into my-osx

[paraslash.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 080b2e35485585c913ca42dede4bbc699394e6ef..4dcf0f2b795161e5ee3e00f2a27e02948fed1a40 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -64,11 +64,14 @@ filter_cmdline_objs="filter.cmdline compress_filter.cmdline"
 filter_errlist_objs="filter_chain wav compress filter string stdin stdout sched fd"
 filter_ldflags=""
 
+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
        time grab_client filter_chain wav compress http_recv dccp dccp_recv
-       recv_common fd sched write_common file_writer"
+       recv_common fd sched write_common file_writer audiod_command"
 audiod_ldflags=""
 
 server_cmdline_objs="server.cmdline"
@@ -149,6 +152,31 @@ if test ${have_ucred} = yes; then
        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"
@@ -358,6 +386,7 @@ audiod_objs="$audiod_cmdline_objs $audiod_errlist_objs"
 server_objs="$server_cmdline_objs $server_errlist_objs"
 write_objs="$write_cmdline_objs $write_errlist_objs"
 client_objs="$client_cmdline_objs $client_errlist_objs"
+audioc_objs="$audioc_cmdline_objs $audioc_errlist_objs"
 
 AC_SUBST(recv_objs, add_dot_o($recv_objs))
 AC_SUBST(recv_ldflags, $recv_ldflags)
@@ -389,6 +418,10 @@ AC_SUBST(client_ldflags, $client_ldflags)
 AC_DEFINE_UNQUOTED(INIT_CLIENT_ERRLISTS,
        objlist_to_errlist($client_errlist_objs), errors used by para_client)
 
+AC_SUBST(audioc_objs, add_dot_o($audioc_objs))
+AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS,
+       objlist_to_errlist($audioc_errlist_objs), errors used by para_audioc)
+
 enum="$(for i in $write_writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)"
 AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS,
        enum of supported writers)