X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=afb993af265065e7082adcf9ebbececa99f11b57;hp=4eb8c5436ca9b0a7d9f3d068d2f9c6c3af050d61;hb=ae657a3b13b4ff76187dad39fede40b98d7cb6d7;hpb=47a19b175dd1f39a878c948ae56a0d7054da20cc diff --git a/configure.ac b/configure.ac index 4eb8c543..afb993af 100644 --- a/configure.ac +++ b/configure.ac @@ -83,20 +83,21 @@ daemon stat crypt http_send close_on_fork ipc acl afh fade amp_filter 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 +udp_recv udp_send color" all_executables="server recv filter audioc write client fsck afh" -recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline" +recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline udp_recv.cmdline" recv_errlist_objs="http_recv recv_common recv time string net dccp_recv - fd sched stdout" + fd sched stdout ggo udp_recv" recv_ldflags="" -receivers=" http dccp" -senders=" http dccp" +receivers=" http dccp udp" +senders=" http dccp udp" 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" @@ -106,11 +107,11 @@ audioc_ldflags="" audiod_cmdline_objs="audiod.cmdline grab_client.cmdline compress_filter.cmdline http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline - audiod_command_list amp_filter.cmdline" + audiod_command_list amp_filter.cmdline udp_recv.cmdline" 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 udp_recv color" audiod_ldflags="" audiod_audio_formats="" @@ -122,12 +123,12 @@ 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 stat crypt http_send close_on_fork ipc dccp_send fd user_list chunk_queue afs osl aft mood score attribute - blob playlist sha1 rbtree sched acl send_common" + blob playlist sha1 rbtree sched acl send_common udp_send color" 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,8 +367,6 @@ AC_CHECK_HEADER(neaacdec.h, [], have_faad=no) 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" @@ -414,6 +413,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" @@ -500,52 +501,6 @@ fi CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" LIBS="$OLD_LIBS" -########################################################################### ortp -have_ortp="yes" -OLD_CPPFLAGS="$CPPFLAGS" -OLD_LD_FLAGS="$LDFLAGS" -OLD_LIBS="$LIBS" -AC_ARG_WITH(ortp_headers, [AC_HELP_STRING(--with-ortp-headers=dir, - [look for ortp/ortp.h also in dir])]) -if test -n "$with_ortp_headers"; then - ortp_cppflags="-I$with_ortp_headers" - CPPFLAGS="$CPPFLAGS $ortp_cppflags" -fi -AC_ARG_WITH(ortp_libs, [AC_HELP_STRING(--with-ortp-libs=dir, - [look for libortp also in dir])]) -if test -n "$with_ortp_libs"; then - ortp_libs="-L$with_ortp_libs" - LDFLAGS="$LDFLAGS $ortp_libs" -fi -AC_CHECK_HEADERS([ortp/ortp.h], [], [have_ortp="no"]) -AC_CHECK_LIB([ortp], [ortp_init], [], [have_ortp="no"]) -if test "$have_ortp" = "yes"; then - all_errlist_objs="$all_errlist_objs ortp_recv ortp_send" - - recv_cmdline_objs="$recv_cmdline_objs ortp_recv.cmdline" - recv_errlist_objs="$recv_errlist_objs ortp_recv" - - audiod_cmdline_objs="$audiod_cmdline_objs ortp_recv.cmdline" - audiod_errlist_objs="$audiod_errlist_objs ortp_recv" - - server_errlist_objs="$server_errlist_objs ortp_send" - - recv_ldflags="$recv_ldflags $ortp_libs -lortp" - server_ldflags="$server_ldflags $ortp_libs -lortp" - audiod_ldflags="$audiod_ldflags $ortp_libs -lortp" - - receivers="$receivers ortp" - senders="$senders ortp" - AC_DEFINE(HAVE_ORTP, 1, [define to 1 to turn on ortp support]) - AC_SUBST(ortp_cppflags) - AC_SUBST(ortp_libs) -else - AC_MSG_NOTICE([deactivating ortp sender/receiver]) -fi -CPPFLAGS="$OLD_CPPFLAGS" -LDFLAGS="$OLD_LDFLAGS" -LIBS="$OLD_LIBS" - AC_SUBST(extra_binaries, [$extras]) AC_SUBST(extra_filter_objs, [$extra_filter_objs]) @@ -735,7 +690,7 @@ AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMAT_ARRAY, $names, array of audio formats sup AC_OUTPUT AC_MSG_NOTICE([creating Makefile.deps]) -gcc -MM -MG $faad_cppflags $mad_cppflags $ortp_cppflags $oggvorbis_cppflags *.c > Makefile.deps +gcc -MM -MG $faad_cppflags $mad_cppflags $oggvorbis_cppflags *.c > Makefile.deps AC_MSG_NOTICE([ paraslash configuration: ~~~~~~~~~~~~~~~~~~~~~~~~