Make effect_id phase-local instead of global.

[movit] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5a8afa7d51e778bc296348539eda6ade9e122440..d21b85aecf361f1e6b9b585c8ac355ccdf765ffc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,14 +2,20 @@ AC_INIT(movit, git)
 
 AC_CONFIG_SRCDIR(effect.cpp)
 
+AC_PROG_CC
 AC_PROG_CXX
 PKG_CHECK_MODULES([Eigen3], [eigen3])
 PKG_CHECK_MODULES([GLEW], [glew])
 
-# These are only needed for the demo app.
+# Needed for unit tests and the demo app.
 PKG_CHECK_MODULES([SDL], [sdl])
-PKG_CHECK_MODULES([SDL_image], [SDL_image])
-PKG_CHECK_MODULES([libpng], [libpng12])
 
-AC_CONFIG_FILES([Makefile])
+# These are only needed for the demo app.
+with_demo_app=yes
+PKG_CHECK_MODULES([SDL_image], [SDL_image], [], [with_demo_app=no; AC_MSG_WARN([SDL_image not found, demo program will not be built])])
+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_CONFIG_FILES([Makefile movit.pc])
 AC_OUTPUT