diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-22 13:10:40 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-01-22 13:10:40 -0500 |
| commit | 4b048d6d6e382fac8df69f8896fc70b8ae4e4cc8 (patch) | |
| tree | 70aa6e6a8ab408e4c4bd603378cc4e5a9f5ecd37 | |
| parent | ada5406c33fa183dbab53d41e1baefc026e7c220 (diff) | |
| download | jack1-4b048d6d6e382fac8df69f8896fc70b8ae4e4cc8.tar.gz | |
fix configure.ac for ZITA-detection and enabling, so that zalsa is built by default if the required libraries are found
| -rw-r--r-- | configure.ac | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index e3da410..1bb09ae 100644 --- a/configure.ac +++ b/configure.ac @@ -683,32 +683,34 @@ fi HAVE_ZITA_BRIDGE_DEPS=false HAVE_ZITA_RESAMPLE=false HAVE_ZITA_ALSA_PCMI=false - + case $build_os in linux*) + 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) + ]) + AC_ARG_ENABLE(zalsa, - AC_HELP_STRING([--enable-zalsa],[Build clients based on Fons Adriensen\'s Zita libraries for access to multiple devices]), + AC_HELP_STRING([--enable-zalsa],[Build clients using Fons Adriensen\'s Zita libraries for access to multiple devices (default=yes if required libraries are present)]), + [ + if test x$enable_zalsa != xno -a 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 + ], [ - 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) - ]) - 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 |