diff --git a/configure b/configure index 719376e2..b2842377 100755 --- a/configure +++ b/configure @@ -1449,7 +1449,8 @@ Optional Features: --disable-dependency-tracking speeds up one-time build --disable-libtool-lock avoid locking (might break parallel builds) - --enable-audio-callback enable callback-based audio I/O + --enable-audio-callback=yes|no + toggle callback-based audio I/O [default=yes] --disable-dsp disable signal processing (echo cancellation, noise suppression, and automatic gain control) @@ -1464,8 +1465,10 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot[=DIR] Search for dependent libraries within DIR (or the compiler's sysroot if not specified). - --without-pulse disable PulseAudio support - --without-alsa disable ALSA support + --with-pulse=yes|no toggle PulseAudio support, ignored if audio + callbacks are enabled [default=yes] + --with-alsa=yes|no toggle ALSA support, ignored if audio callbacks are + enabled [default=yes] Some influential environment variables: CC C compiler command @@ -17818,7 +17821,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "libpulse-dev is required during build, but you don't have it installed. Use --without-pulse to disable PulseAudio support. +as_fn_error $? "libpulse-dev is required during build, but you don't have it installed. Use --with-pulse=no to disable PulseAudio support. See \`config.log' for more details" "$LINENO" 5; } fi @@ -17878,7 +17881,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "libasound-dev is required during build, but you don't have it installed. Use --without-alsa to disable ALSA support. +as_fn_error $? "libasound-dev is required during build, but you don't have it installed. Use --with-alsa=no to disable ALSA support. See \`config.log' for more details" "$LINENO" 5; } fi diff --git a/configure.ac b/configure.ac index f5f5dc02..779b57e3 100644 --- a/configure.ac +++ b/configure.ac @@ -44,14 +44,14 @@ AS_CASE([$host_os], ) AM_CONDITIONAL(TARGET_OS_OSX, test "x$os_osx" == xyes) -AC_ARG_ENABLE([audio-callback], [AS_HELP_STRING([--enable-audio-callback], [enable callback-based audio I/O])], [], [enable_audio_callback=yes]) +AC_ARG_ENABLE([audio-callback], [AS_HELP_STRING([--enable-audio-callback=yes|no], [toggle callback-based audio I/O [default=yes]])], [], [enable_audio_callback=yes]) AM_CONDITIONAL(ENABLE_AUDIO_CALLBACK, test "x$enable_audio_callback" == xyes) AS_IF([test "x$os_osx" != xyes && test "x$enable_audio_callback" != xyes], [ # Linux AC_CHECK_LIB([dl], [dlopen]) - AC_ARG_WITH([pulse], [AS_HELP_STRING([--without-pulse], [disable PulseAudio support])], [], [with_pulse=yes]) - AC_ARG_WITH([alsa], [AS_HELP_STRING([--without-alsa], [disable ALSA support])], [], [with_alsa=yes]) + AC_ARG_WITH([pulse], [AS_HELP_STRING([--with-pulse=yes|no], [toggle PulseAudio support, ignored if audio callbacks are enabled [default=yes]])], [], [with_pulse=yes]) + AC_ARG_WITH([alsa], [AS_HELP_STRING([--with-alsa=yes|no], [toggle ALSA support, ignored if audio callbacks are enabled [default=yes]])], [], [with_alsa=yes]) AS_IF([test "x$with_pulse" == xno && test "x$with_alsa" == xno], [ AC_MSG_FAILURE([You can only disable either ALSA or PulseAudio, not both]); @@ -61,7 +61,7 @@ AS_IF([test "x$os_osx" != xyes && test "x$enable_audio_callback" != xyes], [ # L AC_CHECK_LIB([pulse], [pa_context_new], [ AS_ECHO_N( ) # what is the proper way to check for a library without linking it? ], [ - AC_MSG_FAILURE([libpulse-dev is required during build, but you don't have it installed. Use --without-pulse to disable PulseAudio support.]) + AC_MSG_FAILURE([libpulse-dev is required during build, but you don't have it installed. Use --with-pulse=no to disable PulseAudio support.]) ]) ], [ AC_DEFINE([WITHOUT_PULSE], [1], [Define to disable PulseAudio support]) @@ -71,7 +71,7 @@ AS_IF([test "x$os_osx" != xyes && test "x$enable_audio_callback" != xyes], [ # L AC_CHECK_LIB([asound], [snd_pcm_open], [ AS_ECHO_N( ) # what is the proper way to check for a library without linking it? ], [ - AC_MSG_FAILURE([libasound-dev is required during build, but you don't have it installed. Use --without-alsa to disable ALSA support.]) + AC_MSG_FAILURE([libasound-dev is required during build, but you don't have it installed. Use --with-alsa=no to disable ALSA support.]) ]) ], [ AC_DEFINE([WITHOUT_ALSA], [1], [Define to disable ALSA support])