X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=04a4e934c6ab7b2d90d9d9825ac30e4f13c431aa;hp=cdbdae468d70aa7af88b695c3ae6c0cd2ee456fa;hb=2084249288864e17c43570bd9957bd927864b1b7;hpb=e9caff38b33b06cf0bc90802539bffd13bfe07bc diff --git a/configure.ac b/configure.ac index cdbdae46..04a4e934 100644 --- a/configure.ac +++ b/configure.ac @@ -81,10 +81,11 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \ all_errlist_objs="server mp3_afh afh_common vss command net string signal time 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 afh amp_filter" +client_common recv stdout filter stdin audioc write client fsck exec send_common ggo" + +all_executables="server recv filter audioc write client fsck afh" recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline" recv_errlist_objs="http_recv recv_common recv time string net dccp_recv @@ -95,7 +96,7 @@ receivers=" http dccp" senders=" http dccp" filter_cmdline_objs="filter.cmdline compress_filter.cmdline amp_filter.cmdline" -filter_errlist_objs="filter_chain wav compress 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" @@ -107,9 +108,9 @@ 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_errlist_objs="audiod signal string daemon stat net - time grab_client filter_chain wav compress amp_filter 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" audiod_ldflags="" audiod_audio_formats="" @@ -126,7 +127,7 @@ 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" @@ -315,7 +316,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 @@ -330,13 +331,12 @@ if test "$have_ogg" = "yes"; then 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 @@ -366,11 +366,12 @@ 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_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" - filter_filters="$filter_filters aacdec" - audiod_errlist_objs="$audiod_errlist_objs aacdec aac_common" + 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" @@ -413,9 +414,9 @@ 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" + 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"