From b7ee1f5c40f21be909ff99e88b839a8868e03e41 Mon Sep 17 00:00:00 2001 From: Avuton Olrich Date: Sat, 17 Apr 2010 04:26:18 -0700 Subject: [PATCH] configure.ac: Move Recorder output to Streaming Audio Plugins. --- configure.ac | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/configure.ac b/configure.ac index bf6964382..d069eed70 100644 --- a/configure.ac +++ b/configure.ac @@ -1310,17 +1310,7 @@ if test x$enable_httpd_output = xyes; then fi AM_CONDITIONAL(ENABLE_HTTPD_OUTPUT, test x$enable_httpd_output = xyes) -if test x$enable_shout = xauto; then - # handle shout auto-detection: disable if no encoder is - # available - if test x$enable_encoder = xyes; then - enable_shout=yes - else - AC_MSG_WARN([No encoder plugin -- disabling the shout output plugin]) - enable_shout=no - fi -fi - +dnl --------------------------------- Recorder -------------------------------- if test x$enable_recorder_output = xauto; then # handle recorder auto-detection: disable if no encoder is # available @@ -1332,17 +1322,29 @@ if test x$enable_recorder_output = xauto; then fi fi +if test x$enable_recorder_output = xyes; then + AC_DEFINE(ENABLE_RECORDER_OUTPUT, 1, [Define to enable the recorder output]) +fi +AM_CONDITIONAL(ENABLE_RECORDER_OUTPUT, test x$enable_recorder_output = xyes) + +if test x$enable_shout = xauto; then + # handle shout auto-detection: disable if no encoder is + # available + if test x$enable_encoder = xyes; then + enable_shout=yes + else + AC_MSG_WARN([No encoder plugin -- disabling the shout output plugin]) + enable_shout=no + fi +fi + + + AM_CONDITIONAL(HAVE_SHOUT, test x$enable_shout = xyes) if test x$enable_shout = xyes; then AC_DEFINE(HAVE_SHOUT, 1, [Define to enable the shoutcast output]) fi -AM_CONDITIONAL(ENABLE_RECORDER_OUTPUT, test x$enable_recorder_output = xyes) -if test x$enable_recorder_output = xyes; then - AC_DEFINE(ENABLE_RECORDER_OUTPUT, 1, [Define to enable the recorder output]) -fi - - dnl --------------------------------------------------------------------------- dnl Documentation dnl ---------------------------------------------------------------------------