X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=configure.ac;h=25efcc8e56e49df6e67c259255d94c0c649cf089;hp=823740b9e610c39b69a898f68fe248d012ae9d6c;hb=c72cd5445d110b4519ac6af2f747832e38c3b829;hpb=ddf71f853e64c3912eed4ab98bfe7503826ce8e1

diff --git a/configure.ac b/configure.ac
index 823740b..25efcc8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,6 +3,8 @@ AC_INIT(movit, git)
 LT_INIT
 PKG_PROG_PKG_CONFIG
 
+CXXFLAGS="$CXXFLAGS -std=gnu++11"
+
 AC_CONFIG_SRCDIR(effect.cpp)
 AC_CONFIG_AUX_DIR(.)
 
@@ -12,24 +14,19 @@ 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.
-with_SDL2=no
+# Needed for unit tests and the demo app.
 with_demo_app=yes
-PKG_CHECK_MODULES([SDL2], [sdl2], [with_SDL2=yes], [
-  PKG_CHECK_MODULES([SDL], [sdl])
-])
-
-# These are only needed for the demo app.
-if test $with_SDL2 = "yes"; then
-  PKG_CHECK_MODULES([SDL2_image], [SDL2_image], [], [with_demo_app=no; AC_MSG_WARN([SDL2_image not found, demo program will not be built])])
-else
-  PKG_CHECK_MODULES([SDL_image], [SDL_image], [], [with_demo_app=no; AC_MSG_WARN([SDL_image not found, demo program will not be built])])
-fi
-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_SDL2])
+AC_SUBST([with_benchmark])
 
 with_coverage=no
 AC_ARG_ENABLE([coverage], [  --enable-coverage       build with information needed to compute test coverage], [with_coverage=yes])