X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=8ac2b2a5549192a255665908c9d0be8953bc67a5;hp=3d85f30c49dc906327c6a9362c5e6d15f238c067;hb=4e978838232d77bdb610325b56f4a1a5a0481562;hpb=9734df36c2e18e0906a30ed621daf46351670013 diff --git a/configure.ac b/configure.ac index 3d85f30c..8ac2b2a5 100644 --- a/configure.ac +++ b/configure.ac @@ -92,39 +92,6 @@ AC_CHECK_FUNCS([atexit dup2 memchr memmove memset \ executables="recv filter audioc write afh play" audio_format_handlers="mp3 wma" -audioc_cmdline_objs="audioc" -audioc_errlist_objs=" - audioc - string - net - fd - version - ggo -" -audioc_ldflags="" - -write_cmdline_objs=" - write - file_write -" -write_errlist_objs=" - write - write_common - file_write - time - fd - string - sched - stdin - buffer_tree - ggo - check_wav - version -" -write_ldflags="" -writers="file" -default_writer="FILE_WRITE" - ################################################################## clock_gettime clock_gettime_lib= AC_CHECK_LIB([c], [clock_gettime], [clock_gettime_lib=c], [ @@ -226,8 +193,6 @@ if test "$check_openssl" = "yes"; then openssl_ldflags="$openssl_libs -lssl -lcrypto" AC_SUBST(openssl_ldflags) - server_errlist_objs="$server_errlist_objs crypt" - client_errlist_objs="$client_errlist_objs crypt" audiod_errlist_objs="$audiod_errlist_objs crypt" check_gcrypt="no" @@ -266,8 +231,6 @@ if test "$check_gcrypt" = "yes"; then gcrypt_ldflags="$gcrypt_libs -lgcrypt" AC_SUBST(gcrypt_ldflags) - server_errlist_objs="$server_errlist_objs gcrypt" - client_errlist_objs="$client_errlist_objs gcrypt" audiod_errlist_objs="$audiod_errlist_objs gcrypt" else AC_MSG_WARN([gcrypt library not found]) @@ -379,10 +342,6 @@ if test ${have_core_audio} = yes; then audiod_errlist_objs="$audiod_errlist_objs osx_write ipc" audiod_cmdline_objs="$audiod_cmdline_objs osx_write.cmdline" - write_errlist_objs="$write_errlist_objs osx_write ipc" - write_cmdline_objs="$write_cmdline_objs osx_write.cmdline" - writers="$writers osx" - default_writer="OSX_WRITE" AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X) fi ####################################################### ogg/vorbis/speex/opus @@ -474,14 +433,12 @@ if test "$have_vorbis" = "yes" || \ ogg_ldflags="-Wl,-bind_at_load $ogg_ldflags" fi AC_SUBST(ogg_ldflags) - server_errlist_objs="$server_errlist_objs ogg_afh_common" fi if test "$have_vorbis" = "yes"; then AC_DEFINE(HAVE_OGGVORBIS, 1, define to 1 to turn on ogg/vorbis support) vorbis_ldflags="$vorbis_libs -lvorbis -lvorbisfile" AC_SUBST(vorbis_ldflags) - server_errlist_objs="$server_errlist_objs ogg_afh" audiod_errlist_objs="$audiod_errlist_objs oggdec_filter" audiod_audio_formats="$audiod_audio_formats ogg" @@ -494,7 +451,6 @@ if test "$have_speex" = "yes"; then AC_SUBST(speex_ldflags) - server_errlist_objs="$server_errlist_objs spx_afh spx_common" audiod_errlist_objs="$audiod_errlist_objs spxdec_filter spx_common" audiod_audio_formats="$audiod_audio_formats spx" @@ -509,7 +465,6 @@ if test "$have_opus" = "yes"; then AC_SUBST(opus_ldflags) - server_errlist_objs="$server_errlist_objs opus_afh opus_common" audiod_errlist_objs="$audiod_errlist_objs opusdec_filter opus_common" audiod_audio_formats="$audiod_audio_formats opus" @@ -546,7 +501,6 @@ if test "$have_faad" = "yes"; then AC_SUBST(faad_ldflags) audiod_errlist_objs="$audiod_errlist_objs aacdec_filter aac_common" - server_errlist_objs="$server_errlist_objs aac_afh aac_common" audiod_audio_formats="$audiod_audio_formats aac" audio_format_handlers="$audio_format_handlers aac" @@ -654,7 +608,6 @@ if test "$have_flac" = "yes"; then AC_SUBST(flac_ldflags) audiod_errlist_objs="$audiod_errlist_objs flacdec_filter" - server_errlist_objs="$server_errlist_objs flac_afh" audio_format_handlers="$audio_format_handlers flac" audiod_audio_formats="$audiod_audio_formats flac" else @@ -675,12 +628,8 @@ AC_CHECK_HEADER(sys/soundcard.h, [ audiod_errlist_objs="$audiod_errlist_objs oss_write" audiod_cmdline_objs="$audiod_cmdline_objs oss_write" - write_errlist_objs="$write_errlist_objs oss_write" - write_cmdline_objs="$write_cmdline_objs oss_write" fade_errlist_objs="$fade_errlist_objs oss_mix" - writers="$writers oss" - default_writer="OSS_WRITE" mixers="${mixers}oss " default_mixer="OSS_MIX" @@ -730,12 +679,8 @@ if test "$have_alsa" = "yes"; then audiod_errlist_objs="$audiod_errlist_objs alsa_write" audiod_cmdline_objs="$audiod_cmdline_objs alsa_write" - write_errlist_objs="$write_errlist_objs alsa_write" - write_cmdline_objs="$write_cmdline_objs alsa_write" fade_errlist_objs="$fade_errlist_objs alsa_mix" - writers="$writers alsa" - default_writer="ALSA_WRITE" mixers="${mixers}alsa " default_mixer="ALSA_MIX" fi @@ -794,9 +739,6 @@ if test "$have_ao" = "yes"; then audiod_errlist_objs="$audiod_errlist_objs ao_write" audiod_cmdline_objs="$audiod_cmdline_objs ao_write" - write_errlist_objs="$write_errlist_objs ao_write" - write_cmdline_objs="$write_cmdline_objs ao_write" - writers="$writers ao" fi CPPFLAGS="$OLD_CPPFLAGS" @@ -858,10 +800,9 @@ if test "$have_readline" = "yes"; then fi if test "$have_readline" = "yes"; then + : AC_SUBST(readline_cppflags) AC_SUBST(readline_ldflags) - client_errlist_objs="$client_errlist_objs interactive" - audioc_errlist_objs="$audioc_errlist_objs buffer_tree interactive sched time" AC_DEFINE(HAVE_READLINE, 1, define to 1 to turn on readline support) else AC_MSG_WARN([libreadline not found or unusable]) @@ -911,7 +852,7 @@ if test \( "$have_openssl" = "yes" -o "$have_gcrypt" = "yes" \) \ build_server="yes" executables="$executables server" server_cmdline_objs="server" - server_errlist_objs="$server_errlist_objs + server_errlist_objs=" server afh_common mp3_afh @@ -950,6 +891,36 @@ if test \( "$have_openssl" = "yes" -o "$have_gcrypt" = "yes" \) \ version ggo " + if test "$have_openssl" = "yes"; then + server_errlist_objs="$server_errlist_objs crypt" + fi + if test "$have_gcrypt" = "yes"; then + server_errlist_objs="$server_errlist_objs gcrypt" + fi + if test "$have_vorbis" = "yes" || \ + test "$have_speex" = "yes" || \ + test "$have_opus" = "yes"; then + server_errlist_objs="$server_errlist_objs ogg_afh_common" + fi + if test "$have_vorbis" = "yes"; then + server_errlist_objs="$server_errlist_objs ogg_afh" + fi + if test "$have_speex" = "yes"; then + server_errlist_objs="$server_errlist_objs spx_afh spx_common" + fi + if test "$have_opus" = "yes"; then + server_errlist_objs="$server_errlist_objs opus_afh opus_common" + fi + if test "$have_faad" = "yes"; then + server_errlist_objs="$server_errlist_objs aac_afh aac_common" + fi + if test "$have_flac" = "yes"; then + server_errlist_objs="$server_errlist_objs flac_afh" + fi + server_objs="add_cmdline($server_cmdline_objs) $server_errlist_objs" + AC_SUBST(server_objs, add_dot_o($server_objs)) + AC_DEFINE_UNQUOTED(INIT_SERVER_ERRLISTS, + objlist_to_errlist($server_errlist_objs), errors used by para_server) else build_server="no" fi @@ -958,7 +929,7 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then build_client="yes" executables="$executables client" client_cmdline_objs="client" - client_errlist_objs="$client_errlist_objs + client_errlist_objs=" client net string @@ -974,6 +945,19 @@ if test "$have_openssl" = "yes" -o "$have_gcrypt" = "yes"; then version ggo " + if test "$have_openssl" = "yes"; then + client_errlist_objs="$client_errlist_objs crypt" + fi + if test "$have_gcrypt" = "yes"; then + client_errlist_objs="$client_errlist_objs gcrypt" + fi + if test "$have_readline" = "yes"; then + client_errlist_objs="$client_errlist_objs interactive" + fi + client_objs="add_cmdline($client_cmdline_objs) $client_errlist_objs" + AC_SUBST(client_objs, add_dot_o($client_objs)) + AC_DEFINE_UNQUOTED(INIT_CLIENT_ERRLISTS, + objlist_to_errlist($client_errlist_objs), errors used by para_client) else build_client="no" fi @@ -1355,6 +1339,88 @@ play_objs="add_cmdline($play_cmdline_objs) $play_errlist_objs" AC_SUBST(play_objs, add_dot_o($play_objs)) AC_DEFINE_UNQUOTED(INIT_PLAY_ERRLISTS, objlist_to_errlist($play_errlist_objs), errors used by para_play) +######################################################################### write +write_cmdline_objs=" + write + file_write +" +write_errlist_objs=" + write + write_common + file_write + time + fd + string + sched + stdin + buffer_tree + ggo + check_wav + version +" +writers="file" +default_writer="FILE_WRITE" + +if test "$have_core_audio" = "yes"; then + write_errlist_objs="$write_errlist_objs osx_write ipc" + write_cmdline_objs="$write_cmdline_objs osx_write.cmdline" + writers="$writers osx" + default_writer="OSX_WRITE" +fi +if test "$have_ao" = "yes"; then + write_errlist_objs="$write_errlist_objs ao_write" + write_cmdline_objs="$write_cmdline_objs ao_write" + writers="$writers ao" + default_writer="AO_WRITE" +fi +if test "$have_oss" = "yes"; then + write_errlist_objs="$write_errlist_objs oss_write" + write_cmdline_objs="$write_cmdline_objs oss_write" + writers="$writers oss" + default_writer="OSS_WRITE" +fi +if test "$have_alsa" = "yes"; then + write_errlist_objs="$write_errlist_objs alsa_write" + write_cmdline_objs="$write_cmdline_objs alsa_write" + writers="$writers alsa" + default_writer="ALSA_WRITE" +fi +write_objs="add_cmdline($write_cmdline_objs) $write_errlist_objs" +AC_SUBST(write_objs, add_dot_o($write_objs)) +AC_DEFINE_UNQUOTED(INIT_WRITE_ERRLISTS, + objlist_to_errlist($write_errlist_objs), errors used by para_write) +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) +AC_DEFINE_UNQUOTED(DEFAULT_WRITER, $default_writer, use this writer if none was specified) +names="$(for i in $writers; do printf \"$i\",' ' ; done)" +AC_DEFINE_UNQUOTED(WRITER_NAMES, $names, supported writer names) +inits="$(for i in $writers; do printf 'extern void '$i'_write_init(struct writer *); '; done)" +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) +######################################################################## audioc +audioc_cmdline_objs="audioc" +audioc_errlist_objs=" + audioc + string + net + fd + version + ggo +" +if test "$have_readline" = "yes"; then + audioc_errlist_objs="$audioc_errlist_objs + buffer_tree + interactive + sched + time + " +fi +audioc_objs="add_cmdline($audioc_cmdline_objs) $audioc_errlist_objs" +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) ############################################################# error2.h # these are always built all_errlist_objs=" @@ -1431,10 +1497,6 @@ AC_SUBST(executables) filter_objs="add_cmdline($filter_cmdline_objs) $filter_errlist_objs" audiod_objs="add_cmdline($audiod_cmdline_objs) $audiod_errlist_objs" -server_objs="add_cmdline($server_cmdline_objs) $server_errlist_objs" -write_objs="add_cmdline($write_cmdline_objs) $write_errlist_objs" -client_objs="add_cmdline($client_cmdline_objs) $client_errlist_objs" -audioc_objs="add_cmdline($audioc_cmdline_objs) $audioc_errlist_objs" AC_SUBST(filter_objs, add_dot_o($filter_objs)) AC_DEFINE_UNQUOTED(INIT_FILTER_ERRLISTS, @@ -1445,26 +1507,6 @@ AC_SUBST(audiod_ldflags, $audiod_ldflags) AC_DEFINE_UNQUOTED(INIT_AUDIOD_ERRLISTS, objlist_to_errlist($audiod_errlist_objs), errors used by para_audiod) -AC_SUBST(server_objs, add_dot_o($server_objs)) -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(write_objs, add_dot_o($write_objs)) -AC_SUBST(write_ldflags, $write_ldflags) -AC_DEFINE_UNQUOTED(INIT_WRITE_ERRLISTS, - objlist_to_errlist($write_errlist_objs), errors used by para_write) - -AC_SUBST(client_objs, add_dot_o($client_objs)) -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_SUBST(audioc_ldflags, $audioc_ldflags) -AC_DEFINE_UNQUOTED(INIT_AUDIOC_ERRLISTS, - objlist_to_errlist($audioc_errlist_objs), errors used by para_audioc) - 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) @@ -1477,17 +1519,6 @@ AC_DEFINE_UNQUOTED(DECLARE_FILTER_INITS, $inits, init functions of the supported 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) -AC_DEFINE_UNQUOTED(DEFAULT_WRITER, $default_writer, use this writer if none was specified) -names="$(for i in $writers; do printf \"$i\",' ' ; done)" -AC_DEFINE_UNQUOTED(WRITER_NAMES, $names, supported writer names) -inits="$(for i in $writers; do printf 'extern void '$i'_write_init(struct writer *); '; done)" -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)