X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=configure.ac;h=811364b19b4aded3c0d5f090ef16094e8a5162ea;hp=62aa16d39b0784717fac32d5aac27038c4528528;hb=7649f22106cec2c6eb8bb10f279401e1af5451d0;hpb=4adde8dae3317fa83b81e7a860c9ed9133e99bb0 diff --git a/configure.ac b/configure.ac index 62aa16d3..811364b1 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,6 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile]) AC_DEFUN([add_dot_o],[$(for i in $@; do printf "$i.o "; done)]) -AC_DEFUN([add_cmdline],[$(for i in $@; do printf "${i}.cmdline "; done)]) AC_DEFUN([LIB_ARG_WITH], [ AC_ARG_WITH($1-headers, [AS_HELP_STRING(--with-$1-headers=dir, [look for $1 headers in dir])]) @@ -51,43 +50,14 @@ AC_DEFUN([LIB_SUBST_FLAGS], [ AC_USE_SYSTEM_EXTENSIONS AC_C_BIGENDIAN() -AC_PATH_PROG([GENGETOPT], [gengetopt]) -test -z "$GENGETOPT" && AC_MSG_ERROR( - [gengetopt is required to build this package]) - AC_PATH_PROG([M4], [m4]) test -z "$M4" && AC_MSG_ERROR( [The m4 macro processor is required to build this package]) -AC_PATH_PROG([HELP2MAN], [help2man]) -test -z "$HELP2MAN" && AC_MSG_ERROR( - [help2man is required to build this package]) - -AC_PATH_PROG([INSTALL], [install]) -test -z "$INSTALL" && AC_MSG_ERROR( - [The install program is required to build this package]) - -AC_PATH_PROG([lopsubgen], [lopsubgen]) -test -z "$lopsubgen" && AC_MSG_ERROR( - [lopsubgen is required to build this package]) - AC_PROG_CC AC_PROG_CPP executables="recv filter audioc write afh play" -################################################################## clock_gettime -clock_gettime_lib= -AC_CHECK_LIB([c], [clock_gettime], [clock_gettime_lib=c], [ - AC_CHECK_LIB([rt], [clock_gettime], [clock_gettime_lib=rt], [], []) -]) -if test -n "$clock_gettime_lib"; then - AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [ - define to 1 if clock_gettime() is supported]) -fi -if test "$clock_gettime_lib" = "rt"; then - AC_SUBST(clock_gettime_ldflags, -lrt) -fi - ########################################################################### osl STASH_FLAGS LIB_ARG_WITH([osl], [-losl]) @@ -97,11 +67,13 @@ AC_CHECK_LIB([osl], [osl_open_table], [], [HAVE_OSL=no]) LIB_SUBST_FLAGS(osl) UNSTASH_FLAGS ######################################################################## lopsub +HAVE_LOPSUB=yes +AC_PATH_PROG([LOPSUBGEN], [lopsubgen]) +test -z "$LOPSUBGEN" && HAVE_LOPSUB=no STASH_FLAGS LIB_ARG_WITH([lopsub], [-llopsub]) -HAVE_LOPSUB=yes AC_CHECK_HEADER(lopsub.h, [], [HAVE_LOPSUB=no]) -AC_CHECK_LIB([lopsub], [lls_merge], [], [HAVE_LOPSUB=yes]) +AC_CHECK_LIB([lopsub], [lls_merge], [], [HAVE_LOPSUB=no]) if test $HAVE_LOPSUB = no; then AC_MSG_ERROR([ The lopsub library is required to build this software, but the above checks indicate it is not installed on your system. @@ -202,15 +174,6 @@ AC_MSG_RESULT($have_ucred) if test ${have_ucred} = yes; then AC_DEFINE(HAVE_UCRED, 1, define to 1 you have struct ucred) fi -########################################################################### gengetopt -echo 'option "z" z "" flag off' | $GENGETOPT --file-name conftest-ggo && -AC_CHECK_DECL( - [gengetopt_args_info_description], - [ggo_descriptions_declared=yes], - [ggo_descriptions_declared=no], - [#include "conftest-ggo.h"] -) -AC_SUBST(ggo_descriptions_declared) ########################################################################### curses STASH_FLAGS LIB_ARG_WITH([curses], []) @@ -231,25 +194,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ ]])],[have_ip_mreqn=yes],[have_ip_mreqn=no]) AC_MSG_RESULT($have_ip_mreqn) if test ${have_ip_mreqn} = yes; then - AC_DEFINE(HAVE_IP_MREQN, 1, define to 1 you have struct ip_mreqn) -fi -########################################################################### osx - -AC_MSG_CHECKING(for CoreAudio (MacOs)) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include -]], [[ - AudioDeviceID id; -]])],[have_core_audio=yes],[have_core_audio=no]) -AC_MSG_RESULT($have_core_audio) -if test ${have_core_audio} = yes; then - f1="-framework CoreAudio" - f2="-framework AudioToolbox" - f3="-framework AudioUnit" - f4="-framework CoreServices" - core_audio_ldflags="$f1 $f2 $f3 $f4" - AC_SUBST(core_audio_ldflags) - AC_DEFINE(HAVE_CORE_AUDIO, 1, define to 1 on Mac Os X) + AC_DEFINE(HAVE_IP_MREQN, 1, define to 1 if you have struct ip_mreqn) fi ########################################################################### ogg STASH_FLAGS @@ -317,10 +262,12 @@ AC_DEFUN([NEED_FLAC_OBJECTS], [{ }]) ########################################################################### faad STASH_FLAGS -LIB_ARG_WITH([faad], [-lfaad]) +LIB_ARG_WITH([faad], [-lfaad -lmp4ff]) HAVE_FAAD=yes AC_CHECK_HEADER(neaacdec.h, [], HAVE_FAAD=no) +AC_CHECK_HEADER(mp4ff.h, [], HAVE_FAAD=no) AC_CHECK_LIB([faad], [NeAACDecOpen], [], HAVE_FAAD=no) +AC_CHECK_LIB([mp4ff], [mp4ff_meta_get_artist], [], HAVE_FAAD=no) LIB_SUBST_FLAGS(faad) UNSTASH_FLAGS ########################################################################### mad @@ -397,19 +344,10 @@ AC_CHECK_HEADER(samplerate.h, [], HAVE_SAMPLERATE=no) AC_CHECK_LIB([samplerate], [src_process], [], HAVE_SAMPLERATE=no) LIB_SUBST_FLAGS(samplerate) UNSTASH_FLAGS -########################################################################## mp4v2 -STASH_FLAGS -LIB_ARG_WITH([mp4v2], [-lmp4v2]) -HAVE_MP4V2=yes -AC_CHECK_HEADER([mp4v2/mp4v2.h], [], [HAVE_MP4V2=no]) -AC_CHECK_LIB([mp4v2], [MP4Read], [], [HAVE_MP4V2=no]) -LIB_SUBST_FLAGS(mp4v2) -UNSTASH_FLAGS ######################################################################### server if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then build_server="yes" executables="$executables server" - server_cmdline_objs="server" server_errlist_objs=" server afh_common @@ -448,7 +386,6 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then wma_common sideband version - ggo " if test "$CRYPTOLIB" = openssl; then server_errlist_objs="$server_errlist_objs crypt" @@ -460,10 +397,10 @@ if test -n "$CRYPTOLIB" && test $HAVE_OSL = yes; then NEED_SPEEX_OBJECTS() && server_errlist_objs="$server_errlist_objs spx_afh spx_common" NEED_OPUS_OBJECTS() && server_errlist_objs="$server_errlist_objs opus_afh opus_common" NEED_FLAC_OBJECTS && server_errlist_objs="$server_errlist_objs flac_afh" - if test $HAVE_FAAD = yes && test $HAVE_MP4V2 = yes; then - server_errlist_objs="$server_errlist_objs aac_afh aac_common" + if test $HAVE_FAAD = yes; then + server_errlist_objs="$server_errlist_objs aac_afh" fi - server_objs="add_cmdline($server_cmdline_objs) $server_errlist_objs" + server_objs="$server_errlist_objs" AC_SUBST(server_objs, add_dot_o($server_objs)) else build_server="no" @@ -506,10 +443,6 @@ if test -n "$CRYPTOLIB"; then build_audiod="yes" executables="$executables audiod" audiod_audio_formats="wma" - audiod_cmdline_objs="$audiod_cmdline_objs - audiod - file_write - " audiod_errlist_objs="$audiod_errlist_objs audiod signal @@ -536,7 +469,6 @@ if test -n "$CRYPTOLIB"; then audiod_command fecdec_filter client_common - ggo udp_recv color fec @@ -554,10 +486,6 @@ if test -n "$CRYPTOLIB"; then else audiod_errlist_objs="$audiod_errlist_objs gcrypt" fi - if test "$have_core_audio" = "yes"; then - audiod_errlist_objs="$audiod_errlist_objs osx_write ipc" - audiod_cmdline_objs="$audiod_cmdline_objs osx_write" - fi NEED_VORBIS_OBJECTS && { audiod_errlist_objs="$audiod_errlist_objs oggdec_filter" audiod_audio_formats="$audiod_audio_formats ogg" @@ -575,7 +503,7 @@ if test -n "$CRYPTOLIB"; then audiod_audio_formats="$audiod_audio_formats flac" } if test $HAVE_FAAD = yes; then - audiod_errlist_objs="$audiod_errlist_objs aacdec_filter aac_common" + audiod_errlist_objs="$audiod_errlist_objs aacdec_filter" audiod_audio_formats="$audiod_audio_formats aac" fi if test $HAVE_MAD = yes; then @@ -584,20 +512,17 @@ if test -n "$CRYPTOLIB"; then fi if test $HAVE_OSS = yes; then audiod_errlist_objs="$audiod_errlist_objs oss_write" - audiod_cmdline_objs="$audiod_cmdline_objs oss_write" fi if test $HAVE_ALSA = yes; then audiod_errlist_objs="$audiod_errlist_objs alsa_write" - audiod_cmdline_objs="$audiod_cmdline_objs alsa_write" fi NEED_AO_OBJECTS && { audiod_errlist_objs="$audiod_errlist_objs ao_write" - audiod_cmdline_objs="$audiod_cmdline_objs ao_write" } if test $HAVE_SAMPLERATE = yes; then audiod_errlist_objs="$audiod_errlist_objs resample_filter check_wav" fi - audiod_objs="add_cmdline($audiod_cmdline_objs) $audiod_errlist_objs" + audiod_objs="$audiod_errlist_objs" AC_SUBST(audiod_objs, add_dot_o($audiod_objs)) enum="$(for i in $audiod_audio_formats; do printf "AUDIO_FORMAT_${i}, " | tr '[a-z]' '[A-Z]'; done)" @@ -608,52 +533,27 @@ if test -n "$CRYPTOLIB"; then else build_audiod="no" fi -########################################################################### fade +########################################################################### mixer if test $HAVE_OSS = yes -o $HAVE_ALSA = yes; then - build_fade="yes" - executables="$executables fade" - fade_errlist_objs="fade exec string fd version" + build_mixer="yes" + executables="$executables mixer" + mixer_errlist_objs="mixer exec string fd version" if test $HAVE_OSS = yes; then - fade_errlist_objs="$fade_errlist_objs oss_mix" - mixers="${mixers}oss " - default_mixer="OSS_MIX" + mixer_errlist_objs="$mixer_errlist_objs oss_mix" fi if test $HAVE_ALSA = yes; then - fade_errlist_objs="$fade_errlist_objs alsa_mix" - mixers="${mixers}alsa " - default_mixer="ALSA_MIX" + mixer_errlist_objs="$mixer_errlist_objs alsa_mix" fi - fade_objs="$fade_errlist_objs" - AC_SUBST(fade_objs, add_dot_o($fade_objs)) - enum="$( - for i in $mixers; do - printf "${i}_MIX, " | tr '[a-z]' '[A-Z]' - done - )" - AC_DEFINE_UNQUOTED(MIXER_ENUM, $enum NUM_SUPPORTED_MIXERS, - enum of supported mixers) - AC_DEFINE_UNQUOTED(DEFAULT_MIXER, $default_mixer, - use this mixer if none was specified) - names="$(for i in $mixers; do printf \"$i\",' ' ; done)" - AC_DEFINE_UNQUOTED(MIXER_NAMES, $names, supported mixer names) - inits="$( - for i in $mixers; do - printf 'extern void '$i'_mix_init(struct mixer *); ' - done - )" - AC_DEFINE_UNQUOTED(DECLARE_MIXER_INITS, $inits, - init functions of the supported mixers) - array="$(for i in $mixers; do printf '{.init = '$i'_mix_init},'; done)" - AC_DEFINE_UNQUOTED(MIXER_ARRAY, $array, array of supported mixers) + mixer_objs="$mixer_errlist_objs" + AC_SUBST(mixer_objs, add_dot_o($mixer_objs)) else - build_fade="no" + build_mixer="no" AC_MSG_WARN([no mixer support]) fi ########################################################################### gui if test $HAVE_CURSES = yes; then build_gui="yes" executables="$executables gui" - gui_cmdline_objs="gui" gui_errlist_objs=" exec signal @@ -666,9 +566,8 @@ if test $HAVE_CURSES = yes; then time sched version - ggo " - gui_objs="add_cmdline($gui_cmdline_objs) $gui_errlist_objs" + gui_objs="$gui_errlist_objs" AC_SUBST(gui_objs, add_dot_o($gui_objs)) else build_gui="no" @@ -686,7 +585,6 @@ filter_errlist_objs=" sched fd amp_filter - ggo fecdec_filter fec version @@ -700,15 +598,12 @@ filter_errlist_objs=" net sync_filter " -filter_cmdline_objs=" - filter -" NEED_VORBIS_OBJECTS && filter_errlist_objs="$filter_errlist_objs oggdec_filter" NEED_SPEEX_OBJECTS && filter_errlist_objs="$filter_errlist_objs spxdec_filter spx_common" NEED_OPUS_OBJECTS && filter_errlist_objs="$filter_errlist_objs opusdec_filter opus_common" NEED_FLAC_OBJECTS && filter_errlist_objs="$filter_errlist_objs flacdec_filter" if test $HAVE_FAAD = yes; then - filter_errlist_objs="$filter_errlist_objs aacdec_filter aac_common" + filter_errlist_objs="$filter_errlist_objs aacdec_filter" fi if test $HAVE_MAD = yes; then filter_errlist_objs="$filter_errlist_objs mp3dec_filter" @@ -716,14 +611,10 @@ fi if test $HAVE_SAMPLERATE = yes; then filter_errlist_objs="$filter_errlist_objs resample_filter check_wav" fi -filter_objs="add_cmdline($filter_cmdline_objs) $filter_errlist_objs" +filter_objs="$filter_errlist_objs" AC_SUBST(filter_objs, add_dot_o($filter_objs)) ########################################################################## recv -recv_cmdline_objs=" - recv -" - recv_errlist_objs=" http_recv recv_common @@ -750,14 +641,13 @@ NEED_SPEEX_OBJECTS && recv_errlist_objs="$recv_errlist_objs spx_afh spx_common" NEED_OPUS_OBJECTS && recv_errlist_objs="$recv_errlist_objs opus_afh opus_common" NEED_FLAC_OBJECTS && recv_errlist_objs="$recv_errlist_objs flac_afh" -if test $HAVE_FAAD = yes -a $HAVE_MP4V2 = yes; then - recv_errlist_objs="$recv_errlist_objs aac_afh aac_common" +if test $HAVE_FAAD = yes; then + recv_errlist_objs="$recv_errlist_objs aac_afh" fi -recv_objs="add_cmdline($recv_cmdline_objs) $recv_errlist_objs" +recv_objs="$recv_errlist_objs" AC_SUBST(recv_objs, add_dot_o($recv_objs)) ########################################################################### afh audio_format_handlers="mp3 wma" -afh_cmdline_objs="afh" afh_errlist_objs=" afh string @@ -768,7 +658,6 @@ afh_errlist_objs=" wma_afh wma_common version - ggo " NEED_OGG_OBJECTS && afh_errlist_objs="$afh_errlist_objs ogg_afh_common" NEED_VORBIS_OBJECTS && { @@ -787,12 +676,12 @@ NEED_FLAC_OBJECTS && { afh_errlist_objs="$afh_errlist_objs flac_afh" audio_format_handlers="$audio_format_handlers flac" } -if test $HAVE_FAAD = yes -a $HAVE_MP4V2 = yes; then - afh_errlist_objs="$afh_errlist_objs aac_afh aac_common" +if test $HAVE_FAAD = yes; then + afh_errlist_objs="$afh_errlist_objs aac_afh" audio_format_handlers="$audio_format_handlers aac" fi -afh_objs="add_cmdline($afh_cmdline_objs) $afh_errlist_objs" +afh_objs="$afh_errlist_objs" AC_SUBST(afh_objs, add_dot_o($afh_objs)) ########################################################################## play @@ -828,13 +717,6 @@ play_errlist_objs=" version sync_filter " -play_cmdline_objs=" - file_write -" -if test "$have_core_audio" = "yes"; then - play_errlist_objs="$play_errlist_objs osx_write ipc" - play_cmdline_objs="$play_cmdline_objs osx_write" -fi NEED_OGG_OBJECTS && play_errlist_objs="$play_errlist_objs ogg_afh_common" NEED_VORBIS_OBJECTS && { play_errlist_objs="$play_errlist_objs oggdec_filter ogg_afh" @@ -852,28 +734,19 @@ NEED_FLAC_OBJECTS && { play_errlist_objs="$play_errlist_objs flacdec_filter flac_afh" } if test $HAVE_FAAD = yes; then - play_errlist_objs="$play_errlist_objs aacdec_filter" -fi -if test $HAVE_MP4V2 = yes; then - play_errlist_objs="$play_errlist_objs aac_afh" -fi -if test $HAVE_MP4V2 = yes || test $HAVE_FAAD = yes; then - play_errlist_objs="$play_errlist_objs aac_common" + play_errlist_objs="$play_errlist_objs aac_afh aacdec_filter" fi if test $HAVE_MAD = yes; then play_errlist_objs="$play_errlist_objs mp3dec_filter" fi if test $HAVE_OSS = yes; then play_errlist_objs="$play_errlist_objs oss_write" - play_cmdline_objs="$play_cmdline_objs oss_write" fi if test $HAVE_ALSA = yes; then play_errlist_objs="$play_errlist_objs alsa_write" - play_cmdline_objs="$play_cmdline_objs alsa_write" fi NEED_AO_OBJECTS && { play_errlist_objs="$play_errlist_objs ao_write" - play_cmdline_objs="$play_cmdline_objs ao_write" } if test $HAVE_READLINE = yes; then play_errlist_objs="$play_errlist_objs interactive" @@ -882,13 +755,9 @@ if test $HAVE_SAMPLERATE = yes; then play_errlist_objs="$play_errlist_objs resample_filter check_wav" fi -play_objs="add_cmdline($play_cmdline_objs) $play_errlist_objs" +play_objs="$play_errlist_objs" AC_SUBST(play_objs, add_dot_o($play_objs)) ######################################################################### write -write_cmdline_objs=" - write - file_write -" write_errlist_objs=" write write_common @@ -899,50 +768,21 @@ write_errlist_objs=" 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" - writers="$writers osx" - default_writer="OSX_WRITE" -fi NEED_AO_OBJECTS && { write_errlist_objs="$write_errlist_objs ao_write" - write_cmdline_objs="$write_cmdline_objs ao_write" - writers="$writers ao" - default_writer="AO_WRITE" } 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 -AC_SUBST(writers) -write_objs="add_cmdline($write_cmdline_objs) $write_errlist_objs" +write_objs="$write_errlist_objs" AC_SUBST(write_objs, add_dot_o($write_objs)) -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_errlist_objs=" audioc @@ -969,7 +809,7 @@ 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 amplification artist title year album -comment" +comment max_chunk_size" result= for i in $status_items; do @@ -999,13 +839,11 @@ unix socket credentials: $have_ucred readline (interactive CLIs): $HAVE_READLINE id3 version 2 support: $HAVE_ID3TAG faad: $HAVE_FAAD -mp4v2: $HAVE_MP4V2 audio format handlers: $audio_format_handlers -writers: $writers para_server: $build_server para_gui: $build_gui -para_fade: $build_fade +para_mixer: $build_mixer para_client: $build_client para_audiod: $build_audiod ])