diff options
| author | Jonas Suhr Christensen <jsc@umbraculum.org> | 2015-02-22 13:44:26 +0100 |
|---|---|---|
| committer | Jonas Suhr Christensen <jsc@umbraculum.org> | 2015-02-22 13:44:26 +0100 |
| commit | 780d7ab9f57f0441449ea76d6e2e321b1fa70c5f (patch) | |
| tree | a9b155ace901c01dd3432e34212e50fbaa5f1ecf | |
| parent | 72e8838da2f4c7693f50a39032e19c8210b0a267 (diff) | |
| parent | 63e232ff9d45044d62d481e6c73e7d804b51fd09 (diff) | |
Merge branch 'resample_configure'
| -rw-r--r-- | configure.ac | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index 03a8c31..bbe4429 100644 --- a/configure.ac +++ b/configure.ac @@ -326,10 +326,11 @@ 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 resampling using libzita-resampler, set to 'src' to force use of libsamplerate (slow). [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 @@ -338,14 +339,13 @@ AS_IF([test x$enable_resampler != xno], [AC_MSG_WARN([*** Building resample support!]) AC_DEFINE(WITH_RESAMPLER, [], [Use resample]) - AS_IF([test x$enable_resampler == xauto || test x$enable_resampler == xsrc], + AS_CASE([$enable_resampler], + [src], [dnl ====================== dnl Check for libsamplerate dnl ====================== - PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.1.7, has_src=yes, has_src=no)] - ) - - AS_IF([test x$enable_resampler == xauto || test x$enable_resampler == xzita], + PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.1.7, has_src=yes, has_src=no)], + [zita], [dnl ====================== dnl Check for the zitaresampler library dnl ====================== @@ -372,19 +372,10 @@ AS_IF([test x$enable_resampler != xno], LIBS="$tmp_LIBS" AC_SUBST(ZITA_CPPFLAGS) AC_SUBST(ZITA_LIBS) - AC_LANG_POP([C++])] - )] -) - -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.])] - )] + AC_LANG_POP([C++])], + [AC_MSG_ERROR([*** Bad argument '$enable_resampler'.])] + ) + ] ) AS_IF([test x$enable_resampler == xzita], |