diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2015-02-12 20:26:58 +0100 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2015-02-12 20:26:58 +0100 |
| commit | 9a106193f0651ae844069d283c36562044f3a4c4 (patch) | |
| tree | 2d62e138d76aea1007ed1bdcec1aca065bf24827 | |
| parent | 3d54f7408e2a42c6ec1868fad051a4bf3728878b (diff) | |
| parent | 447d87649811caa7ddd55940300fbe25b0336cfc (diff) | |
Merge remote-tracking branch 'origin/master' into lv2opt
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 8 |
2 files changed, 6 insertions, 6 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 \ 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.])] )] ) |