Merge branch 'master' into epoxy

Conflicts:
	Makefile.in

diff --cc Makefile.in
index 0c2e9eed6f9f6bfa31c42b53f81440486c4fe81c,fadd3a32200136573f58a8b013cf339032307867..3a2461f41edf6a55d0d106aed69767b5a3a79b37
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -8,7 -8,7 +8,8 @@@ datarootdir = @datarootdir
  datadir = @datadir@
  top_builddir = @top_builddir@
  with_demo_app = @with_demo_app@
 +with_SDL2 = @with_SDL2@
+ with_coverage = @with_coverage@
  
  CC=@CC@
  CXX=@CXX@

diff --cc configure.ac
index 79e99cadbaf0162dba9c83cf17968339ebed5261,5e032345d778ddf14b53fe6e0aeb2a241410d8ca..f9117465aa9625ba7adb09bf8ca16d32783a4421
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -26,7 -18,10 +26,11 @@@ f
  PKG_CHECK_MODULES([libpng], [libpng12], [], [with_demo_app=no; AC_MSG_WARN([libpng12 not found, demo program will not be built])])
  
  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