diff options
| -rw-r--r-- | clutter/configure.ac | 29 | ||||
| -rw-r--r-- | clutter/tests/interactive/Makefile.am | 8 |
2 files changed, 6 insertions, 31 deletions
diff --git a/clutter/configure.ac b/clutter/configure.ac index 6089e0b88..6e44e0165 100644 --- a/clutter/configure.ac +++ b/clutter/configure.ac @@ -405,32 +405,11 @@ else fi fi -dnl === Enable GDK-Pixbuf in tests ============================================ +dnl === Check for GDK-Pixbuf in tests ========================================= -m4_define([pixbuf_default], [yes]) -AC_ARG_ENABLE([gdk-pixbuf], - [AS_HELP_STRING([--enable-gdk-pixbuf=@<:@no/yes@:>@], - [Enable tests using GDK-Pixbuf @<:@default=]pixbuf_default[@:>@])], - [enable_pixbuf=$enable_val], - [enable_pixbuf=pixbuf_default]) - -AS_CASE([$enable_pixbuf], - - [yes], - [ - PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0]) - AC_SUBST(GDK_PIXBUF_CFLAGS) - AC_SUBST(GDK_PIXBUF_LIBS) - pixbuf_tests=yes - ], - - [no], - [ - pixbuf_tests=no - ] -) - -AM_CONDITIONAL([PIXBUF_TESTS], [test "x$pixbuf_tests" = "xyes"]) +PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0]) +AC_SUBST(GDK_PIXBUF_CFLAGS) +AC_SUBST(GDK_PIXBUF_LIBS) dnl === Enable debug level ==================================================== diff --git a/clutter/tests/interactive/Makefile.am b/clutter/tests/interactive/Makefile.am index 0174e2a48..a341159e6 100644 --- a/clutter/tests/interactive/Makefile.am +++ b/clutter/tests/interactive/Makefile.am @@ -44,17 +44,13 @@ UNIT_TESTS = \ test-keyframe-transition.c \ test-bind-constraint.c \ test-touch-events.c \ - test-rotate-zoom.c + test-rotate-zoom.c \ + test-image.c if X11_TESTS UNIT_TESTS += test-pixmap.c endif -if PIXBUF_TESTS -UNIT_TESTS += \ - test-image.c -endif - SHEXT = $(EXEEXT) # For convenience, this provides a way to easily run individual unit tests: |