diff options
author | Lars Bisballe Jensen <larsbisballe@gmail.com> | 2015-02-22 14:11:57 +0100 |
---|---|---|
committer | Lars Bisballe Jensen <larsbisballe@gmail.com> | 2015-02-22 14:11:57 +0100 |
commit | 04b10f6443a31e87f7bca1f7ec796978b49fa201 (patch) | |
tree | 1803859a41722a063c5d5ab79c41776923a703ca | |
parent | c4b1f4b7ff6e0ae0342ddb738bb04c7c8c67195d (diff) | |
parent | 61edcf3da8f0cfe308488147306f4c288419be88 (diff) |
Merge branch 'master' of http://git.drumgizmo.org/drumgizmo
-rw-r--r-- | configure.ac | 33 | ||||
-rw-r--r-- | version.h | 2 |
2 files changed, 13 insertions, 22 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], @@ -1 +1 @@ -#define VERSION "0.9.7" +#define VERSION "0.9.8" |