From 4ec74e7d2d36b61c3d70c002b1fff2650772bb2a Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Thu, 26 Dec 2013 13:29:27 -0500 Subject: [PATCH] add --enable-zalsa configure argument to avoid circular dependency between ZITA and JACK --- configure.ac | 45 ++++++++++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index f2ed759..b5f351f 100644 --- a/configure.ac +++ b/configure.ac @@ -689,24 +689,39 @@ fi # if we have Fons Adriensen's zita libs installed, we can build the zita-based # internal clients for using additional (ALSA) devices with JACK +HAVE_ZITA_BRIDGE_DEPS=false HAVE_ZITA_RESAMPLE=false HAVE_ZITA_ALSA_PCMI=false -AC_CHECK_LIB(zita-resampler, _Z28zita_resampler_major_versionv, - [ - HAVE_ZITA_RESAMPLE=true - AC_MSG_RESULT(yes) - ]) -AC_CHECK_LIB(zita-alsa-pcmi, _Z28zita_alsa_pcmi_major_versionv, - [ - HAVE_ZITA_ALSA_PCMI=true - AC_MSG_RESULT(yes) - ]) -HAVE_ZITA_BRIDGE_DEPS=false -if test x$HAVE_ZITA_RESAMPLE = xtrue -a x$HAVE_ZITA_ALSA_PCMI = xtrue ; then - AC_DEFINE(HAVE_ZITA_BRIDGE_DEPS,1,"Whether we have the libs needed for Zita ALSA bridge support") - HAVE_ZITA_BRIDGE_DEPS=true -fi +case $build_os in + linux*) + AC_ARG_ENABLE(zalsa, + AC_HELP_STRING([--enable-zalsa],[Build clients based on Fons Adriensen\'s Zita libraries for access to multiple devices]), + [ + if test x$enable_zalsa != xno ; then + HAVE_ZITA_RESAMPLE=false + HAVE_ZITA_ALSA_PCMI=false + AC_CHECK_LIB(zita-resampler, _Z28zita_resampler_major_versionv, + [ + HAVE_ZITA_RESAMPLE=true + AC_MSG_RESULT(yes) + ]) + AC_CHECK_LIB(zita-alsa-pcmi, _Z28zita_alsa_pcmi_major_versionv, + [ + HAVE_ZITA_ALSA_PCMI=true + AC_MSG_RESULT(yes) + ]) + + HAVE_ZITA_BRIDGE_DEPS=false + if test x$HAVE_ZITA_RESAMPLE = xtrue -a x$HAVE_ZITA_ALSA_PCMI = xtrue ; then + AC_DEFINE(HAVE_ZITA_BRIDGE_DEPS,1,"Whether we have the libs needed for Zita ALSA bridge support") + HAVE_ZITA_BRIDGE_DEPS=true + fi + fi + ] + ) + ;; +esac # Celt low-latency audio codec. netjack transmission via internet. HAVE_CELT=false