X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=configure.ac;h=7515e6def9a1ef36969136ebb98e6d551a003fd5;hp=f6b2e1dafe818274043e32ebc8a6960692f8b687;hb=849e2cd0910a468c1aa7b11cd855c685421781ae;hpb=f4919e93c097501c8adcdfe11b7e79cab2f1cc5c

diff --git a/configure.ac b/configure.ac
index f6b2e1d..7515e6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,15 +1,23 @@
+AC_CONFIG_MACRO_DIR([m4])
 AC_INIT(movit, git)
+LT_INIT
 
 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])
+
+# 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