diff --git a/build/autotools/m4/lol-gl.m4 b/build/autotools/m4/lol-gl.m4
index c5f085b1..50286988 100644
--- a/build/autotools/m4/lol-gl.m4
+++ b/build/autotools/m4/lol-gl.m4
@@ -15,10 +15,12 @@ dnl
 # ---------------------
 AC_DEFUN([LOL_AC_CHECK_OPENGL],
 [
+ac_cv_my_have_gl="no"
 ac_cv_my_have_glew="no"
 if test "${enable_gl}" != "no"; then
   LOL_AC_CHECK_OPENGL_INNER()
 fi
+AM_CONDITIONAL(LOL_USE_GL, test "${ac_cv_my_have_gl}" != "no")
 AM_CONDITIONAL(LOL_USE_GLEW, test "${ac_cv_my_have_glew}" != "no")
 ])
 
diff --git a/doc/samples/Makefile.am b/doc/samples/Makefile.am
index 9d6b9eb2..12ad0928 100644
--- a/doc/samples/Makefile.am
+++ b/doc/samples/Makefile.am
@@ -7,7 +7,10 @@ bench: benchsuite$(EXEEXT)
 	./benchsuite$(EXEEXT)
 
 if BUILD_SAMPLES
-noinst_PROGRAMS = bluenoise benchsuite btphystest nacl_phystest simplex
+noinst_PROGRAMS = bluenoise benchsuite simplex
+if LOL_USE_GL
+noinst_PROGRAMS += btphystest nacl_phystest
+endif
 endif
 
 bluenoise_SOURCES = bluenoise.cpp
diff --git a/doc/samples/meshviewer/Makefile.am b/doc/samples/meshviewer/Makefile.am
index d8146947..38dd3ec5 100644
--- a/doc/samples/meshviewer/Makefile.am
+++ b/doc/samples/meshviewer/Makefile.am
@@ -2,8 +2,10 @@
 include $(top_srcdir)/build/autotools/common.am
 
 if BUILD_SAMPLES
+if LOL_USE_GL
 noinst_PROGRAMS = meshviewer
 endif
+endif
 
 meshviewer_SOURCES = meshviewer.cpp meshviewer.h \
     scenesetup.cpp scenesetup.h \
diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am
index a94e1392..b2540453 100644
--- a/doc/tutorial/Makefile.am
+++ b/doc/tutorial/Makefile.am
@@ -2,12 +2,17 @@
 include $(top_srcdir)/build/autotools/common.am
 
 if BUILD_TUTORIAL
-noinst_PROGRAMS = 01_triangle 02_cube 03_noise 04_texture 05_easymesh \
-                  06_sprite 07_input 08_fbo 09_sound 11_fractal \
-                  12_voronoi 13_shader_builder 14_lol_lua 15_lolimgui \
-                  16_movie
+noinst_PROGRAMS = $(tutorials)
 endif
 
+tutorials =
+if LOL_USE_GL
+tutorials += 01_triangle 02_cube 03_noise 04_texture 05_easymesh \
+             06_sprite 07_input 08_fbo 09_sound 11_fractal \
+             12_voronoi 13_shader_builder 14_lol_lua 15_lolimgui
+endif
+tutorials += 16_movie
+
 01_triangle_SOURCES = 01_triangle.cpp 01_triangle.lolfx
 01_triangle_CPPFLAGS = $(AM_CPPFLAGS)
 01_triangle_DEPENDENCIES = @LOL_DEPS@
diff --git a/src/t/Makefile.am b/src/t/Makefile.am
index be4c22c0..3ea42ff3 100644
--- a/src/t/Makefile.am
+++ b/src/t/Makefile.am
@@ -7,9 +7,23 @@ noinst_PROGRAMS = $(testsuite)
 TESTS = $(testsuite)
 endif
 
-# Conditionally built for now because of STLport issues
-if !LOL_USE_ANDROID
-testsuite = test-base test-math test-sys test-image test-entity
+testsuite = test-base test-math
+
+if LOL_USE_GL
+testsuite += test-entity # FIXME: this should not really depend on GL
+testsuite += test-sys
+endif
+
+if LOL_USE_GDIPLUS
+testsuite += test-image
+else
+if LOL_USE_LIBPNG
+testsuite += test-image
+else
+if LOL_USE_IMLIB2
+testsuite += test-image
+endif
+endif
 endif
 
 test_base_SOURCES = test-common.cpp \