From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Wed, 12 Mar 2014 00:25:39 +0000 (+0100)
Subject: Merge branch 'master' into epoxy
X-Git-Tag: 1.1~12^2~32
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=5b6ab865efa692b25590f302c111b30680fbacdd

Merge branch 'master' into epoxy

Conflicts:
	Makefile.in
---

5b6ab865efa692b25590f302c111b30680fbacdd
diff --cc Makefile.in
index 0c2e9ee,fadd3a3..3a2461f
--- a/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 79e99ca,5e03234..f911746
--- a/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