X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=configure.ac;h=427e67d8499d23c8758c06f546a830535094269f;hp=1007ce28668de7bf4f969e8892a5e9b8f9def7a7;hb=e5cbf154d2d8ebcca9f17370de489337af8081b3;hpb=9e219b96e914b2e5709ba3c3345afdc3cf13a78d

diff --git a/configure.ac b/configure.ac
index 1007ce2..427e67d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,12 @@
 AC_CONFIG_MACRO_DIR([m4])
 AC_INIT(movit, git)
 LT_INIT
+PKG_PROG_PKG_CONFIG
+
+CXXFLAGS="$CXXFLAGS -std=gnu++11"
 
 AC_CONFIG_SRCDIR(effect.cpp)
+AC_CONFIG_AUX_DIR(.)
 
 AC_PROG_CC
 AC_PROG_CXX
@@ -24,9 +28,13 @@ if test $with_SDL2 = "yes"; then
 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([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])
 AC_SUBST([with_SDL2])
 
 with_coverage=no