From 57be89c154f4828532c58debbb3d7fbfea39dcc0 Mon Sep 17 00:00:00 2001
From: Jonas Suhr Christensen <jsc@umbraculum.org>
Date: Sat, 21 Feb 2015 19:48:35 +0100
Subject: Using zita as default if --enable-resampler=yes. Use src only if
--enable-resample=src.
---
configure.ac | 17 +++--------------
1 file 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])
--
cgit v1.2.3
From 63e232ff9d45044d62d481e6c73e7d804b51fd09 Mon Sep 17 00:00:00 2001
From: Jonas Suhr Christensen <jsc@umbraculum.org>
Date: Sun, 22 Feb 2015 13:42:28 +0100
Subject: Libzita-resampler used as default. Libsamplerate only used if
specified.
---
configure.ac | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9829359..bbe4429 100644
--- a/configure.ac
+++ b/configure.ac
@@ -326,7 +326,8 @@ 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). [default=no]]),,
+ 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="zita"])
@@ -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,8 +372,10 @@ AS_IF([test x$enable_resampler != xno],
LIBS="$tmp_LIBS"
AC_SUBST(ZITA_CPPFLAGS)
AC_SUBST(ZITA_LIBS)
- AC_LANG_POP([C++])]
- )]
+ AC_LANG_POP([C++])],
+ [AC_MSG_ERROR([*** Bad argument '$enable_resampler'.])]
+ )
+ ]
)
AS_IF([test x$enable_resampler == xzita],
--
cgit v1.2.3