Merge branch 'master' into epoxy

[movit] / configure.ac

diff --git a/configure.ac b/configure.ac
index 79e99cadbaf0162dba9c83cf17968339ebed5261..1007ce28668de7bf4f969e8892a5e9b8f9def7a7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,7 @@ AC_PROG_CC
 AC_PROG_CXX
 PKG_CHECK_MODULES([Eigen3], [eigen3])
 PKG_CHECK_MODULES([epoxy], [epoxy])
+PKG_CHECK_MODULES([FFTW3], [fftw3])
 
 # Needed for unit tests and the demo app. We prefer SDL2 if possible,
 # but can also use classic SDL.
@@ -28,5 +29,9 @@ PKG_CHECK_MODULES([libpng], [libpng12], [], [with_demo_app=no; AC_MSG_WARN([libp
 AC_SUBST([with_demo_app])
 AC_SUBST([with_SDL2])
 
+with_coverage=no
+AC_ARG_ENABLE([coverage], [  --enable-coverage       build with information needed to compute test coverage], [with_coverage=yes])
+AC_SUBST([with_coverage])
+
 AC_CONFIG_FILES([Makefile movit.pc])
 AC_OUTPUT