Merge branch 'epoxy' into epoxy

Conflicts:
	Makefile.in
	movit.pc.in

diff --combined Makefile.in
index 77ced6c3d048af72ef3799602394615c323cc11b,cd56fa6f643228e7f5d1e84ea13a9bccead28cd9..69fa663c787d254d0379ec463553f062eea5a7e4
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -22,14 -22,14 +22,14 @@@ with_coverage = @with_coverage
  
  CC=@CC@
  CXX=@CXX@
- CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@
+ CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @SDL2_CFLAGS@ @SDL_CFLAGS@ @Eigen3_CFLAGS@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@
  ifeq ($(with_SDL2),yes)
  CXXFLAGS += -DHAVE_SDL2
  endif
  LDFLAGS=@LDFLAGS@
  LDLIBS=@epoxy_LIBS@ @FFTW3_LIBS@ -lpthread
 -TEST_LDLIBS=@epoxy_LIBS@ @SDL_LIBS@ -lpthread
 -DEMO_LDLIBS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
 +TEST_LDLIBS=@epoxy_LIBS@ @SDL2_LIBS@ @SDL_LIBS@ -lpthread
 +DEMO_LDLIBS=@SDL2_image_LIBS@ @SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
  SHELL=@SHELL@
  LIBTOOL=@LIBTOOL@ --tag=CXX
  RANLIB=ranlib