X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=4cb283d26092ca87923162e86a9655d4f0993be5;hp=a1cba833e9041437958c17725dc1aff1db59355c;hb=2239be1b3bfb2e8af9f855a6cda61b92d7b22fef;hpb=2bda5cdb96fa0ca4f322e3b349ec2c6ce4aae97c diff --git a/configure.ac b/configure.ac index a1cba833..4cb283d2 100644 --- a/configure.ac +++ b/configure.ac @@ -78,17 +78,24 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \ strncasecmp strrchr strspn alarm mkdir rmdir], [], [AC_MSG_ERROR([function not found, cannot live without it])]) +cmdline_dir="cmdline" +AC_SUBST(cmdline_dir) +AC_DEFUN([add_cmdline],[$(for i in $@; do printf "${cmdline_dir}/${i}.cmdline "; done)]) + + 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 aft mood score attribute blob ringbuffer playlist sha1 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 exec send_common ggo -udp_recv udp_send color fec fecdec_filter prebuffer_filter mm" +udp_recv udp_send color fec fecdec_filter prebuffer_filter mm +server_command_list afs_command_list audiod_command_list" all_executables="server recv filter audioc write client afh" -recv_cmdline_objs="recv.cmdline http_recv.cmdline dccp_recv.cmdline udp_recv.cmdline" +recv_cmdline_objs="add_cmdline(recv http_recv dccp_recv udp_recv)" + recv_errlist_objs="http_recv recv_common recv time string net dccp_recv fd sched stdout ggo udp_recv fec" recv_ldflags="" @@ -96,58 +103,55 @@ recv_ldflags="" receivers=" http dccp udp" senders=" http dccp udp" -filter_cmdline_objs="filter.cmdline compress_filter.cmdline amp_filter.cmdline - prebuffer_filter.cmdline" +filter_cmdline_objs="add_cmdline(filter compress_filter amp_filter prebuffer_filter)" filter_errlist_objs="filter_common wav_filter compress_filter filter string stdin stdout sched fd amp_filter ggo fecdec_filter fec prebuffer_filter time" filter_ldflags="" filters=" compress wav amp fecdec prebuffer" -audioc_cmdline_objs="audioc.cmdline" +audioc_cmdline_objs="add_cmdline(audioc)" audioc_errlist_objs="audioc string net fd" audioc_ldflags="" -audiod_cmdline_objs="audiod.cmdline compress_filter.cmdline - http_recv.cmdline dccp_recv.cmdline file_write.cmdline client.cmdline - audiod_command_list amp_filter.cmdline udp_recv.cmdline - prebuffer_filter.cmdline sha1" +audiod_cmdline_objs="add_cmdline(audiod compress_filter http_recv dccp_recv file_write client amp_filter udp_recv prebuffer_filter)" 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 fecdec_filter - client_common ggo udp_recv color fec prebuffer_filter" + client_common ggo udp_recv color fec prebuffer_filter sha1 audiod_command_list" audiod_ldflags="" audiod_audio_formats="" -afh_cmdline_objs="afh.cmdline" +afh_cmdline_objs="add_cmdline(afh)" 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_cmdline_objs="add_cmdline(server)" server_errlist_objs="server afh_common mp3_afh vss command net string signal time daemon crypt http_send close_on_fork mm ipc dccp_send fd user_list chunk_queue afs aft mood score attribute - blob playlist sha1 sched acl send_common udp_send color fec" + blob playlist sha1 sched acl send_common udp_send color fec + server_command_list afs_command_list" server_ldflags="-losl" server_audio_formats=" mp3" -write_cmdline_objs="write.cmdline file_write.cmdline" +write_cmdline_objs="add_cmdline(write file_write)" write_errlist_objs="write write_common file_write time fd string sched stdin ggo" write_ldflags="" writers=" file" default_writer="FILE_WRITE" -client_cmdline_objs="client.cmdline" +client_cmdline_objs="add_cmdline(client)" client_errlist_objs="client net string crypt fd sched stdin stdout client_common sha1" client_ldflags="" -gui_cmdline_objs="gui.cmdline" +gui_cmdline_objs="add_cmdline(gui)" 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_cmdline_objs="add_cmdline(fade)" fade_errlist_objs="fade exec string fd" @@ -375,8 +379,8 @@ if test "$have_ogg" = "yes"; then 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" + filter_cmdline_objs="$filter_cmdline_objs add_cmdline(oggdec_filter)" + audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(oggdec_filter)" server_errlist_objs="$server_errlist_objs ogg_afh" filter_errlist_objs="$filter_errlist_objs oggdec_filter" @@ -460,8 +464,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" + filter_cmdline_objs="$filter_cmdline_objs add_cmdline(mp3dec_filter)" + audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(mp3dec_filter)" all_errlist_objs="$all_errlist_objs mp3dec_filter" filter_errlist_objs="$filter_errlist_objs mp3dec_filter" audiod_errlist_objs="$audiod_errlist_objs mp3dec_filter" @@ -511,10 +515,10 @@ AC_CHECK_HEADER(sys/soundcard.h, [ all_executables="$all_executables fade" all_errlist_objs="$all_errlist_objs oss_write" audiod_errlist_objs="$audiod_errlist_objs oss_write" - audiod_cmdline_objs="$audiod_cmdline_objs oss_write.cmdline" + audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(oss_write)" write_errlist_objs="$write_errlist_objs oss_write" - write_cmdline_objs="$write_cmdline_objs oss_write.cmdline" + write_cmdline_objs="$write_cmdline_objs add_cmdline(oss_write)" writers="$writers oss" default_writer="OSS_WRITE" AC_CHECK_LIB(ossaudio, _oss_ioctl, [ @@ -561,11 +565,11 @@ fi if test "$have_alsa" = "yes"; then all_errlist_objs="$all_errlist_objs alsa_write" audiod_errlist_objs="$audiod_errlist_objs alsa_write" - audiod_cmdline_objs="$audiod_cmdline_objs alsa_write.cmdline" + audiod_cmdline_objs="$audiod_cmdline_objs add_cmdline(alsa_write)" audiod_ldflags="$audiod_ldflags -lasound" write_errlist_objs="$write_errlist_objs alsa_write" - write_cmdline_objs="$write_cmdline_objs alsa_write.cmdline" + write_cmdline_objs="$write_cmdline_objs add_cmdline(alsa_write)" write_ldflags="$write_ldflags -lasound" writers="$writers alsa" default_writer="ALSA_WRITE" @@ -758,8 +762,6 @@ names="$(for i in $audiod_audio_formats; do printf \"$i\",' ' ; done)" AC_DEFINE_UNQUOTED(AUDIOD_AUDIO_FORMAT_ARRAY, $names, array of audio formats supported by audiod) AC_OUTPUT -AC_MSG_NOTICE([creating Makefile.deps]) -gcc -MM -MG $faad_cppflags $mad_cppflags $oggvorbis_cppflags *.c > Makefile.deps AC_MSG_NOTICE([ paraslash configuration: ~~~~~~~~~~~~~~~~~~~~~~~~