summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2015-02-12 21:39:15 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2015-02-12 21:39:15 +0100
commitd180e4eef8f59ddebd8cf6ac3d4d5ce7ac9610f4 (patch)
treec6f7d186b090c268ec7effe7f908541b31b3967c /configure.ac
parentd212427fec1e02cb7350c623efd35aa9da2ac02e (diff)
parentff598f2855e428bf06d9008ef3416915f8be45e3 (diff)
Merge remote-tracking branch 'origin/master' into lv2opt
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac14
1 files changed, 9 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index 066046d..4b2e4db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,7 +88,6 @@ 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)]
)
dnl ======================
@@ -371,6 +370,8 @@ AS_IF([test x$enable_resampler != xno],
CFLAGS="$tmp_CFLAGS"
LDFLAGS="$tmp_LDFLAGS"
LIBS="$tmp_LIBS"
+ AC_SUBST(ZITA_CPPFLAGS)
+ AC_SUBST(ZITA_LIBS)
AC_LANG_POP([C++])]
)]
)
@@ -389,8 +390,8 @@ 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_SUBST(ZITA_CPPFLAGS)
- AC_SUBST(ZITA_LIBS)
+ SAMPLERATE_CFLAGS=""
+ SAMPLERATE_LIBS=""
],
[AC_MSG_ERROR([*** zita-resampler library or headers not found. Set ZITA_LDFLAGS or ZITA_CPPFLAGS to add searchpath.])]
)]
@@ -398,8 +399,10 @@ AS_IF([test x$enable_resampler == xzita],
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