summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2015-02-15 10:43:07 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2015-02-15 10:43:07 +0100
commit6188081a19dc60209add5e4f2e1c57d64520f914 (patch)
tree04b96ffba97a23352ebd8a7bcc49f0003b79e465 /configure.ac
parent8660860404db3fed04a1d9373d6b90a8f173c809 (diff)
parent3d695f697e7230f3b4fa8922847b20eae632226f (diff)
Merge with master. Remove obsolete -p argument from cli. Add new -a argument for async kit loading.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac16
1 files changed, 10 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 070677c..03a8c31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -87,8 +87,7 @@ AC_ARG_WITH([test],
AS_IF([test x$with_test == xyes],
[AC_MSG_WARN([*** Building unittests!])
- AM_PATH_CPPUNIT(1.9.6)
- AC_CONFIG_FILES(test/Makefile)]
+ AM_PATH_CPPUNIT(1.9.6)]
)
dnl ======================
@@ -390,16 +389,20 @@ AS_IF([test x$enable_resampler == xauto],
AS_IF([test x$enable_resampler == xzita],
[AS_IF([test x$has_zita == xyes],
- [AC_DEFINE(USE_ZITA, [], [zita-resampler is present])],
-
+ [AC_DEFINE(USE_ZITA, [], [zita-resampler is present])
+ SAMPLERATE_CFLAGS=""
+ SAMPLERATE_LIBS=""
+ ],
[AC_MSG_ERROR([*** zita-resampler library or headers not found. Set ZITA_LDFLAGS or ZITA_CPPFLAGS to add searchpath.])]
)]
)
AS_IF([test x$enable_resampler == xsrc],
[AS_IF([test x$has_src == xyes],
- [AC_DEFINE(USE_SRC, [], [libsamplerate is present])],
-
+ [AC_DEFINE(USE_SRC, [], [libsamplerate is present])
+ ZITA_CPPFLAGS=""
+ ZITA_LIBS=""
+ ],
[AC_MSG_ERROR([*** Missing libsamplerate.])]
)]
)
@@ -538,6 +541,7 @@ AC_CONFIG_FILES(
plugingui/Makefile
include/Makefile
man/Makefile
+ test/Makefile
drumgizmo/Makefile
drumgizmo/input/Makefile
drumgizmo/input/dummy/Makefile