From 197c86e765ba48174809b01849576b688f41db63 Mon Sep 17 00:00:00 2001
From: Jonas Suhr Christensen <jsc@umbraculum.org>
Date: Thu, 12 Feb 2015 19:16:46 +0100
Subject: Added test to dist.

---
 Makefile.am | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c2579ee..84bcaa7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = gnu
-SUBDIRS = plugingui tools include src vst lv2 drumgizmo man
-DISTDIRS = plugingui tools include src vst lv2 drumgizmo man
+SUBDIRS = plugingui tools include src vst lv2 drumgizmo man test
+DISTDIRS = plugingui tools include src vst lv2 drumgizmo man test
 
 EXTRA_DIST = \
 	version.h \
-- 
cgit v1.2.3


From 447d87649811caa7ddd55940300fbe25b0336cfc Mon Sep 17 00:00:00 2001
From: Jonas Suhr Christensen <jsc@umbraculum.org>
Date: Thu, 12 Feb 2015 19:21:57 +0100
Subject: Moved zitaflags to only be set if zita-resampler is present (and
 enabled).

---
 configure.ac | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 070677c..066046d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -371,8 +371,6 @@ 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++])]
        )]
 )
@@ -390,8 +388,10 @@ 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])
+              AC_SUBST(ZITA_CPPFLAGS)
+              AC_SUBST(ZITA_LIBS)
+             ],
              [AC_MSG_ERROR([*** zita-resampler library or headers not found. Set ZITA_LDFLAGS or ZITA_CPPFLAGS to add searchpath.])]
        )]
 )
-- 
cgit v1.2.3