X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=afb993af265065e7082adcf9ebbececa99f11b57;hp=64ef3f90d83b5701761a97c2a272c07c3ae4bbc4;hb=de9a70360fcd3b5285d280ad1f229f679d453603;hpb=979b3fb9ec3ba1cc1c2fee1c7184c6ad09ef1b1e diff --git a/configure.ac b/configure.ac index 64ef3f90..afb993af 100644 --- a/configure.ac +++ b/configure.ac @@ -79,25 +79,27 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \ [AC_MSG_ERROR([function not found, cannot live without it])]) all_errlist_objs="server mp3_afh afh_common vss command net string signal time -daemon stat crypt http_send close_on_fork ipc acl +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_chain wav compress +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" -all_executables="server recv filter audioc write client fsck" +client_common recv stdout filter stdin audioc write client fsck exec send_common ggo +udp_recv udp_send color" -recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline" +all_executables="server recv filter audioc write client fsck afh" + +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" -filter_errlist_objs="filter_chain wav compress filter string stdin stdout sched fd" +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 ggo" filter_ldflags="" -filters=" compress wav" +filters=" compress wav amp" audioc_cmdline_objs="audioc.cmdline" audioc_errlist_objs="audioc string net fd" @@ -105,24 +107,28 @@ 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" + audiod_command_list amp_filter.cmdline udp_recv.cmdline" audiod_errlist_objs="audiod signal string daemon stat net - time grab_client filter_chain wav compress http_recv dccp_recv + 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="" +afh_cmdline_objs="afh.cmdline" +afh_errlist_objs="afh string fd mp3_afh afh_common time" +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 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" @@ -135,10 +141,15 @@ fsck_cmdline_objs="fsck.cmdline" fsck_errlist_objs="osl rbtree fsck string sha1 fd" gui_cmdline_objs="gui.cmdline" -gui_errlist_objs="exec close_on_fork signal string stat ringbuffer fd" +gui_errlist_objs="exec signal string stat ringbuffer fd" gui_other_objs="gui gui_theme" gui_objs="$gui_cmdline_objs $gui_errlist_objs $gui_other_objs" +fade_cmdline_objs="fade.cmdline" +fade_errlist_objs="fade exec string fd" + + + ########################################################################### ssl dnl @synopsis CHECK_SSL dnl @@ -306,7 +317,7 @@ AC_CHECK_LIB([ogg], [ogg_stream_init], [], [ have_ogg="no" ]) AC_CHECK_LIB([vorbis], [vorbis_info_init], [], [ have_ogg="no" ]) AC_CHECK_HEADERS([ogg/ogg.h vorbis/codec.h], [], [ have_ogg="no" ]) if test "$have_ogg" = "yes"; then - all_errlist_objs="$all_errlist_objs oggdec ogg_afh" + all_errlist_objs="$all_errlist_objs oggdec_filter ogg_afh" AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg vorbis support) filters="$filters oggdec" if test "$OSTYPE" = "Darwin"; then @@ -315,17 +326,18 @@ if test "$have_ogg" = "yes"; then 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 -logg -lvorbis -lvorbisfile" filter_cmdline_objs="$filter_cmdline_objs oggdec_filter.cmdline" audiod_cmdline_objs="$audiod_cmdline_objs oggdec_filter.cmdline" server_errlist_objs="$server_errlist_objs ogg_afh" - filter_errlist_objs="$filter_errlist_objs oggdec" - audiod_errlist_objs="$audiod_errlist_objs oggdec" + filter_errlist_objs="$filter_errlist_objs oggdec_filter" + audiod_errlist_objs="$audiod_errlist_objs oggdec_filter" + afh_errlist_objs="$afh_errlist_objs ogg_afh" audiod_audio_formats="ogg" server_audio_formats="$server_audio_formats ogg" - filter_filters="$filter_filters oggdec" AC_SUBST(oggvorbis_cppflags) AC_SUBST(oggvorbis_libs) else @@ -355,14 +367,15 @@ 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) - all_errlist_objs="$all_errlist_objs aac_common aacdec aac_afh" - filter_errlist_objs="$filter_errlist_objs aacdec aac_common" - filter_filters="$filter_filters aacdec" - audiod_errlist_objs="$audiod_errlist_objs aacdec aac_common" + 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" + audiod_errlist_objs="$audiod_errlist_objs aacdec_filter aac_common" server_errlist_objs="$server_errlist_objs aac_afh aac_common" server_ldflags="$server_ldflags $faad_libs -lfaad" filter_ldflags="$filter_ldflags $faad_libs -lfaad" audiod_ldflags="$audiod_ldflags $faad_libs -lfaad" + afh_ldflags="$afh_ldflags $faad_libs -lfaad" audiod_audio_formats="$audiod_audio_formats aac" server_audio_formats="$server_audio_formats aac" filters="$filters aacdec" @@ -400,9 +413,11 @@ 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) - all_errlist_objs="$all_errlist_objs mp3dec" - filter_errlist_objs="$filter_errlist_objs mp3dec" - audiod_errlist_objs="$audiod_errlist_objs mp3dec" + 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" filter_ldflags="$filter_ldflags $mad_libs -lmad" audiod_ldflags="$audiod_ldflags $mad_libs -lmad" audiod_audio_formats="$audiod_audio_formats mp3" @@ -421,6 +436,21 @@ fi CPPFLAGS="$OLD_CPPFLAGS" LDFLAGS="$OLD_LDFLAGS" LIBS="$OLD_LIBS" +###################################################################### libid3tag +AC_MSG_CHECKING(for libid3tag) +AC_TRY_LINK([ + #include +],[ + struct id3_tag t = {.flags = 0}; +],[have_libid3tag=yes],[have_libid3tag=no]) +AC_MSG_RESULT($have_libid3tag) +if test ${have_libid3tag} = yes; then + AC_DEFINE(HAVE_LIBID3TAG, 1, define to 1 you have libid3tag) + server_ldflags="$server_ldflags -lid3tag" + afh_ldflags="$afh_ldflags -lid3tag" +else + AC_MSG_WARN([no support for id3v2 tags]) +fi ########################################################################### alsa have_alsa="yes" OLD_CPPFLAGS="$CPPFLAGS" @@ -429,17 +459,19 @@ OLD_LIBS="$LIBS" if test "$OSTYPE" != "Linux"; then have_alsa="no" fi -msg="=> can not build para_fade, and no alsa support for para_audiod/para_write" +msg="=> will not build para_fade" if test "$have_alsa" = "yes"; then - AC_CHECK_HEADER(linux/soundcard.h, - [extras="$extras para_fade"], + AC_CHECK_HEADER(linux/soundcard.h, [ + extras="$extras para_fade" + all_executables="$all_executables fade" + ], [ have_alsa="no" AC_MSG_WARN([no linux/soundcard.h $msg]) ] ) fi - +msg="=> no alsa support for para_audiod/para_write" if test "$have_alsa" = "yes"; then AC_CHECK_HEADERS([alsa/asoundlib.h], [], [ have_alsa="no" @@ -469,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]) @@ -527,7 +513,6 @@ AC_DEFUN([add_dot_o],[$(for i in $@; do printf "$i.o "; done)]) AC_DEFUN([objlist_to_errlist],[$(for i in $@; do printf "DEFINE_ERRLIST($(echo $i| tr 'a-z' 'A-Z'));"; done) [const char **para_errlist[[]]] = {$(for i in $@; do printf "PARA_ERRLIST($(echo $i | tr 'a-z' 'A-Z')), "; done) }]) ############################################################# error2.h - AC_DEFUN([define_safe_error_enums], [ exe="" @@ -587,7 +572,7 @@ status_flags format score audio_file_info taginfo1 taginfo2 afs_mode attributes_txt decoder_flags audiod_status play_time attributes_bitmap offset seconds_total stream_start current_time audiod_uptime image_id lyrics_id duration directory lyrics_name image_name path hash channels -last_played num_chunks chunk_time" +last_played num_chunks chunk_time amplification" # $1: prefix, $2: items AC_DEFUN([make_enum_items], [$( @@ -621,6 +606,8 @@ write_objs="$write_cmdline_objs $write_errlist_objs" client_objs="$client_cmdline_objs $client_errlist_objs" fsck_objs="$fsck_cmdline_objs $fsck_errlist_objs" audioc_objs="$audioc_cmdline_objs $audioc_errlist_objs" +afh_objs="$afh_cmdline_objs $afh_errlist_objs" +fade_objs="$fade_cmdline_objs $fade_errlist_objs" AC_SUBST(recv_objs, add_dot_o($recv_objs)) AC_SUBST(recv_ldflags, $recv_ldflags) @@ -642,6 +629,11 @@ AC_SUBST(server_ldflags, $server_ldflags) AC_DEFINE_UNQUOTED(INIT_SERVER_ERRLISTS, objlist_to_errlist($server_errlist_objs), errors used by para_server) +AC_SUBST(afh_objs, add_dot_o($afh_objs)) +AC_SUBST(afh_ldflags, $afh_ldflags) +AC_DEFINE_UNQUOTED(INIT_AFH_ERRLISTS, + objlist_to_errlist($afh_errlist_objs), errors used by para_afh) + AC_SUBST(write_objs, add_dot_o($write_objs)) AC_SUBST(write_ldflags, $write_ldflags) AC_DEFINE_UNQUOTED(INIT_WRITE_ERRLISTS, @@ -666,6 +658,19 @@ AC_SUBST(gui_objs, add_dot_o($gui_objs)) AC_DEFINE_UNQUOTED(INIT_GUI_ERRLISTS, objlist_to_errlist($gui_errlist_objs), errors used by para_gui) +AC_SUBST(fade_objs, add_dot_o($fade_objs)) +AC_DEFINE_UNQUOTED(INIT_FADE_ERRLISTS, + objlist_to_errlist($fade_errlist_objs), errors used by para_fade) + + +enum="$(for i in $filters; do printf "${i}_FILTER, " | tr '[a-z]' '[A-Z]'; done)" +AC_DEFINE_UNQUOTED(FILTER_ENUM, $enum NUM_SUPPORTED_FILTERS, + enum of supported filters) +inits="$(for i in $filters; do printf 'extern void '$i'_filter_init(struct filter *f); '; done)" +AC_DEFINE_UNQUOTED(DECLARE_FILTER_INITS, $inits, init functions of the supported filters) +array="$(for i in $filters; do printf '{.name = \"'$i'\", .init = '$i'_filter_init},'; done)" +AC_DEFINE_UNQUOTED(FILTER_ARRAY, $array, array of supported filters) + enum="$(for i in $writers; do printf "${i}_WRITE, " | tr '[a-z]' '[A-Z]'; done)" AC_DEFINE_UNQUOTED(WRITER_ENUM, $enum NUM_SUPPORTED_WRITERS, enum of supported writers) @@ -676,6 +681,7 @@ inits="$(for i in $writers; do printf 'extern void '$i'_write_init(struct writer AC_DEFINE_UNQUOTED(DECLARE_WRITER_INITS, $inits, init functions of the supported writers) array="$(for i in $writers; do printf '{.init = '$i'_write_init},'; done)" AC_DEFINE_UNQUOTED(WRITER_ARRAY, $array, array of supported writers) + enum="$(for i in $audiod_audio_formats; do printf "AUDIO_FORMAT_${i}, " | tr '[a-z]' '[A-Z]'; done)" AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMATS_ENUM, $enum NUM_AUDIO_FORMATS, enum of audio formats supported by audiod) @@ -684,13 +690,14 @@ 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: ~~~~~~~~~~~~~~~~~~~~~~~~ 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 +id3 version2 support: $have_libid3tag +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