Release Movit 1.6.0.

[movit] / configure.ac

diff --git a/configure.ac b/configure.ac
index 93e168b222a924a90310e4b6b0cd3af44258478e..5bc98f015e5d6e4891f3fb322270aef6f9280391 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,18 +9,24 @@ AC_CONFIG_AUX_DIR(.)
 AC_PROG_CC
 AC_PROG_CXX
 PKG_CHECK_MODULES([Eigen3], [eigen3])
-PKG_CHECK_MODULES([GLEW], [glew])
+PKG_CHECK_MODULES([epoxy], [epoxy])
 PKG_CHECK_MODULES([FFTW3], [fftw3])
 
-# Needed for unit tests and the demo app.
-PKG_CHECK_MODULES([SDL], [sdl])
+CXXFLAGS="$CXXFLAGS -std=gnu++11"
 
-# These are only needed for the demo app.
+# Needed for unit tests and the demo app.
 with_demo_app=yes
-PKG_CHECK_MODULES([SDL_image], [SDL_image], [], [with_demo_app=no; AC_MSG_WARN([SDL_image not found, demo program will not be built])])
-PKG_CHECK_MODULES([libpng], [libpng12], [], [with_demo_app=no; AC_MSG_WARN([libpng12 not found, demo program will not be built])])
+PKG_CHECK_MODULES([SDL2], [sdl2])
+
+# This is only needed for the demo app.
+PKG_CHECK_MODULES([SDL2_image], [SDL2_image], [], [with_demo_app=no; AC_MSG_WARN([SDL2_image not found, demo program will not be built])])
+PKG_CHECK_MODULES([libpng], [libpng], [], [with_demo_app=no; AC_MSG_WARN([libpng not found, demo program will not be built])])
+
+# This is only needed for microbenchmarks, so optional.
+PKG_CHECK_MODULES([benchmark], [benchmark], [with_benchmark=yes], [with_benchmark=no; AC_MSG_WARN([Google microbenchmark framework not found, microbenchmarks will not be built])])
 
 AC_SUBST([with_demo_app])
+AC_SUBST([with_benchmark])
 
 with_coverage=no
 AC_ARG_ENABLE([coverage], [  --enable-coverage       build with information needed to compute test coverage], [with_coverage=yes])