summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Suhr Christensen <jsc@umbraculum.org>2015-02-12 19:21:57 +0100
committerJonas Suhr Christensen <jsc@umbraculum.org>2015-02-12 19:21:57 +0100
commit447d87649811caa7ddd55940300fbe25b0336cfc (patch)
tree93d61f0d848ec8c947129e1b6e7d35bd70068505
parent197c86e765ba48174809b01849576b688f41db63 (diff)
Moved zitaflags to only be set if zita-resampler is present (and enabled).
-rw-r--r--configure.ac8
1 files 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.])]
)]
)