.gitignore more unit tests.

[movit] / configure.ac

diff --git a/configure.ac b/configure.ac
index f044a172521503a5e921ae0a019c6ff978fa193c..7515e6def9a1ef36969136ebb98e6d551a003fd5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,6 @@
+AC_CONFIG_MACRO_DIR([m4])
 AC_INIT(movit, git)
+LT_INIT
 
 AC_CONFIG_SRCDIR(effect.cpp)
 
@@ -7,10 +9,15 @@ 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])
+
+# 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