diff options
| author | Jonas Suhr Christensen <jsc@umbraculum.org> | 2015-02-21 19:48:35 +0100 |
|---|---|---|
| committer | Jonas Suhr Christensen <jsc@umbraculum.org> | 2015-02-21 19:48:35 +0100 |
| commit | 57be89c154f4828532c58debbb3d7fbfea39dcc0 (patch) | |
| tree | 7688b9ff18c2491b2e9603e56d68410186ffddf1 | |
| parent | f911543bd7b565953cb2609506925460d3b53dcd (diff) | |
Using zita as default if --enable-resampler=yes. Use src only if --enable-resample=src.
| -rw-r--r-- | configure.ac | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index 03a8c31..9829359 100644 --- a/configure.ac +++ b/configure.ac @@ -326,10 +326,10 @@ PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0.20) AC_ARG_ENABLE([resampler], - AS_HELP_STRING([--enable-resampler[=lib]], [Enable resampler using either 'zita' or 'src' (libsamplerate). Use 'auto' for autodetect [default=auto]]),, - [enable_resampler="auto"]) + AS_HELP_STRING([--enable-resampler[=lib]], [Enable resampler using either 'zita' or 'src' (libsamplerate). [default=no]]),, + [enable_resampler="no"]) -AS_IF([test "x$enable_resampler" = "xyes"], [enable_resampler="auto"]) +AS_IF([test "x$enable_resampler" = "xyes"], [enable_resampler="zita"]) has_src=no has_zita=no @@ -376,17 +376,6 @@ AS_IF([test x$enable_resampler != xno], )] ) -AS_IF([test x$enable_resampler == xauto], - [AS_IF([test x$has_zita == xyes], - [enable_resampler=zita], - - [test x$has_src == xyes], - [enable_resampler=src], - - [AC_MSG_ERROR([*** No resampler library present. Either libsamplerate or zita-resampler must be installed.])] - )] -) - AS_IF([test x$enable_resampler == xzita], [AS_IF([test x$has_zita == xyes], [AC_DEFINE(USE_ZITA, [], [zita-resampler is present]) |