summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
0f4790f)
configure.ac already has a section for para_fade, but the construction
of $fade_errlist_objs was still spread out over the whole file. Move
everything to the existing section and remove @fade_ldflags@.
This also kills the $mixer_summary variable, which was not very useful.
para_fade: $(fade_objs)
@[ -z "$(Q)" ] || echo 'LD $@'
para_fade: $(fade_objs)
@[ -z "$(Q)" ] || echo 'LD $@'
- $(Q) $(CC) -o $@ $(fade_objs) @fade_ldflags@ $(LDFLAGS)
+ $(Q) $(CC) -o $@ $(fade_objs) $(LDFLAGS)
para_server: $(server_objs)
@[ -z "$(Q)" ] || echo 'LD $@'
para_server: $(server_objs)
@[ -z "$(Q)" ] || echo 'LD $@'
msg="=> will not build oss writer"
AC_CHECK_HEADER(sys/soundcard.h, [
msg="=> will not build oss writer"
AC_CHECK_HEADER(sys/soundcard.h, [
- fade_errlist_objs="$fade_errlist_objs oss_mix"
-
- mixers="${mixers}oss "
- default_mixer="OSS_MIX"
-
AC_CHECK_LIB(ossaudio, _oss_ioctl, [
oss_ldflags="-lossaudio"
AC_SUBST(oss_ldflags)
AC_CHECK_LIB(ossaudio, _oss_ioctl, [
oss_ldflags="-lossaudio"
AC_SUBST(oss_ldflags)
if test "$have_alsa" = "yes"; then
alsa_ldflags="-lasound"
AC_SUBST(alsa_ldflags)
if test "$have_alsa" = "yes"; then
alsa_ldflags="-lasound"
AC_SUBST(alsa_ldflags)
- fade_errlist_objs="$fade_errlist_objs alsa_mix"
-
- mixers="${mixers}alsa "
- default_mixer="ALSA_MIX"
fi
CPPFLAGS="$OLD_CPPFLAGS"
fi
CPPFLAGS="$OLD_CPPFLAGS"
build_audiod="no"
fi
########################################################################### fade
build_audiod="no"
fi
########################################################################### fade
-if test -n "$mixers"; then
+if test "$have_oss" = "yes" -o "$have_alsa" = "yes"; then
build_fade="yes"
executables="$executables fade"
build_fade="yes"
executables="$executables fade"
- fade_errlist_objs="$fade_errlist_objs fade exec string fd version ggo"
+ fade_errlist_objs="fade exec string fd version ggo"
+ if test "$have_oss" = "yes"; then
+ fade_errlist_objs="$fade_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"
+ mixers="${mixers}alsa "
+ default_mixer="ALSA_MIX"
+ fi
fade_objs="add_cmdline($fade_cmdline_objs) $fade_errlist_objs"
AC_SUBST(fade_objs, add_dot_o($fade_objs))
fade_objs="add_cmdline($fade_cmdline_objs) $fade_errlist_objs"
AC_SUBST(fade_objs, add_dot_o($fade_objs))
- AC_SUBST(fade_ldflags, $fade_ldflags)
AC_DEFINE_UNQUOTED(INIT_FADE_ERRLISTS,
objlist_to_errlist($fade_errlist_objs),
errors used by para_fade)
AC_DEFINE_UNQUOTED(INIT_FADE_ERRLISTS,
objlist_to_errlist($fade_errlist_objs),
errors used by para_fade)
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)
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_summary="supported mixers:: $mixers, default: $default_mixer"
else
build_fade="no"
AC_MSG_WARN([no mixer support])
else
build_fade="no"
AC_MSG_WARN([no mixer support])
- mixer_summary="para_fade: no"
fi
########################################################################### gui
if test "$have_curses" = "yes"; then
fi
########################################################################### gui
if test "$have_curses" = "yes"; then
filters: $(echo $filters)
writers: $writers
filters: $(echo $filters)
writers: $writers
para_server: $build_server
para_gui: $build_gui
para_fade: $build_fade
para_server: $build_server
para_gui: $build_gui
para_fade: $build_fade