Merge branch 'master' into epoxy

Conflicts:
	Makefile.in
	movit.pc.in

diff --cc Makefile.in
index ee3626b53eeb12d303e1c0021a2590d5dfd286d2,445f5b7dd96c858f21ca81494d5706cc141fa77d..cd56fa6f643228e7f5d1e84ea13a9bccead28cd9
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -13,12 -21,11 +22,14 @@@ with_coverage = @with_coverage
  
  CC=@CC@
  CXX=@CXX@
 -CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_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=@epoxy_LIBS@ @SDL2_LIBS@ @SDL_LIBS@ @FFTW3_LIBS@ -lpthread
- DEMO_LDLIBS=@SDL2_image_LIBS@ @SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
+ LDFLAGS=@LDFLAGS@
 -LDLIBS=@GLEW_LIBS@ @FFTW3_LIBS@ -lpthread
 -TEST_LDLIBS=@GLEW_LIBS@ @SDL_LIBS@ -lpthread
++LDLIBS=@epoxy_LIBS@ @FFTW3_LIBS@ -lpthread
++TEST_LDLIBS=@epoxy_LIBS@ @SDL_LIBS@ -lpthread
+ DEMO_LDLIBS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
  SHELL=@SHELL@
  LIBTOOL=@LIBTOOL@ --tag=CXX
  RANLIB=ranlib

diff --cc README
Simple merge

diff --cc complex_modulate_effect.cpp
Simple merge

diff --cc configure.ac
Simple merge

diff --cc movit.pc.in
index 6069a06e4d72f0b468f97ef979b1f629b4cd8e60,b11ba15277fb135814a91fff23c530ffd85b8e35..20427c6acd4ee123a5832c17546ab4e8900732c6
--- 1/movit.pc.in
--- 2/movit.pc.in
+++ b/movit.pc.in
@@@ -13,5 -13,6 +13,6 @@@ Description: Movit is a library for hig
  Version: git
  Requires:
  Conflicts:
- Libs: -lmovit @epoxy_LIBS@
- Cflags: -I${includedir}/movit @Eigen3_CFLAGS@ @epoxy_CFLAGS@
+ Libs: -lmovit
 -Libs.private: @GLEW_LIBS@ @FFTW3_LIBS@
 -Cflags: -I${includedir}/movit @Eigen3_CFLAGS@ @GLEW_CFLAGS@ @FFTW3_CFLAGS@
++Libs.private: @epoxy_LIBS@ @FFTW3_LIBS@
++Cflags: -I${includedir}/movit @Eigen3_CFLAGS@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@