From 447d87649811caa7ddd55940300fbe25b0336cfc Mon Sep 17 00:00:00 2001 From: Jonas Suhr Christensen 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(-) (limited to 'configure.ac') 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 From b41f42da60cdd5b4b6b376a49f18e8ebfc9bda0f Mon Sep 17 00:00:00 2001 From: Jonas Suhr Christensen Date: Thu, 12 Feb 2015 21:35:16 +0100 Subject: Make sure that we don't link with resampler libraries that we are not using. --- configure.ac | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 066046d..1e8b1ea 100644 --- a/configure.ac +++ b/configure.ac @@ -371,6 +371,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 +391,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 +400,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.])] )] ) -- cgit v1.2.3 From 820f477ca00a01354b4a832b5e213df2b74baaa8 Mon Sep 17 00:00:00 2001 From: Jonas Suhr Christensen Date: Thu, 12 Feb 2015 21:36:37 +0100 Subject: Always generate test/Makefile. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 1e8b1ea..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 ====================== @@ -542,6 +541,7 @@ AC_CONFIG_FILES( plugingui/Makefile include/Makefile man/Makefile + test/Makefile drumgizmo/Makefile drumgizmo/input/Makefile drumgizmo/input/dummy/Makefile -- cgit v1.2.3 From 1971b7c898f710df4d66e0a70e2ec707ab6e18fd Mon Sep 17 00:00:00 2001 From: Jonas Suhr Christensen Date: Thu, 12 Feb 2015 21:41:19 +0100 Subject: Fixed missing end bracket. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 4b2e4db..03a8c31 100644 --- a/configure.ac +++ b/configure.ac @@ -87,7 +87,7 @@ AC_ARG_WITH([test], AS_IF([test x$with_test == xyes], [AC_MSG_WARN([*** Building unittests!]) - AM_PATH_CPPUNIT(1.9.6) + AM_PATH_CPPUNIT(1.9.6)] ) dnl ====================== -- cgit v1.2.3