X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=configure.ac;h=4fe45795be482644875d5010be2a8a9fa7fd5c13;hb=7031f4e380b429e9c0eea1b8e5484dabdbb12ae5;hp=54a313ad64111e9f8eef02cd175898a9743f6c73;hpb=dd7675ad75d88dfebaf56cb0cab2f6c3171d5c85;p=paraslash.git diff --git a/configure.ac b/configure.ac index 54a313ad..4fe45795 100644 --- a/configure.ac +++ b/configure.ac @@ -580,23 +580,23 @@ 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" + mixer_errlist_objs="$mixer_errlist_objs oss_mix" mixers="${mixers}oss " default_mixer="OSS_MIX" fi if test $HAVE_ALSA = yes; then - fade_errlist_objs="$fade_errlist_objs alsa_mix" + mixer_errlist_objs="$mixer_errlist_objs alsa_mix" mixers="${mixers}alsa " default_mixer="ALSA_MIX" fi - fade_objs="$fade_errlist_objs" - AC_SUBST(fade_objs, add_dot_o($fade_objs)) + mixer_objs="$mixer_errlist_objs" + AC_SUBST(mixer_objs, add_dot_o($mixer_objs)) enum="$( for i in $mixers; do printf "${i}_MIX, " | tr '[a-z]' '[A-Z]' @@ -618,7 +618,7 @@ if test $HAVE_OSS = yes -o $HAVE_ALSA = yes; then array="$(for i in $mixers; do printf '{.init = '$i'_mix_init},'; done)" AC_DEFINE_UNQUOTED(MIXER_ARRAY, $array, array of supported mixers) else - build_fade="no" + build_mixer="no" AC_MSG_WARN([no mixer support]) fi ########################################################################### gui @@ -927,7 +927,7 @@ audio format handlers: $audio_format_handlers para_server: $build_server para_gui: $build_gui -para_fade: $build_fade +para_mixer: $build_mixer para_client: $build_client para_audiod: $build_audiod ])