[rygel] build: Add option to always run tests

[Jens Georg <jensgeorg src gnome org>]

commit 5a488bfb988cb3a54d017c8c09a1a7d27e42e25d
Author: Jens Georg <mail jensge org>
Date:   Sat Oct 8 09:59:39 2011 +0200

    build: Add option to always run tests

 TODO              |    4 ----
 autogen.sh        |    2 +-
 configure.ac      |    6 ++++++
 tests/Makefile.am |    4 ++++
 4 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/TODO b/TODO
index 22acaab..391c7fc 100644
--- a/TODO
+++ b/TODO
@@ -36,10 +36,6 @@
 
   * crash on trying to trancode ogg to wmv.
 
-  * Always build/run tests if configured with '--enable-tests'.
-
-  * autogen passes '--enable-tests' to configure by default.
-
   * Use common.m4 in tests/Makefile.am (Probably not possible).
 
   * Cache response(s). If user fast forwards a stream, one request completes and
diff --git a/autogen.sh b/autogen.sh
index b7e7944..cb8c8c5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,5 +13,5 @@ REQUIRED_AUTOCONF_VERSION=2.64 \
 REQUIRED_LIBTOOL_VERSION=2.2.6 \
 REQUIRED_INTLTOOL_VERSION=0.40.0 \
 gnome-autogen.sh --enable-vala --enable-maintainer-mode --enable-debug \
-                 --enable-strict-valac --enable-test-plugin \
+                 --enable-strict-valac --enable-tests --enable-test-plugin \
                  --enable-mediathek-plugin --enable-gst-launch-plugin "$@"
diff --git a/configure.ac b/configure.ac
index 42f6cd9..cec6179 100644
--- a/configure.ac
+++ b/configure.ac
@@ -160,6 +160,12 @@ fi
 AC_SUBST(HAVE_GTK)
 AM_CONDITIONAL(BUILD_UI, test x$BUILD_UI = xyes)
 
+dnl Tests
+AC_ARG_ENABLE([tests],
+              AS_HELP_STRING([--enable-tests],[always build tests]),,
+              enable_tests=no)
+AM_CONDITIONAL([ALWAYS_TEST], [test "x$enable_tests" = "xyes"])
+
 dnl Check additional requirements for MediaExport plugins
 if test "x$enable_media_export_plugin" = "xyes";
 then
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e01705e..d6fb113 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -71,3 +71,7 @@ rygel_album_art_spec_test_SOURCES = rygel-album-art-spec-test.vala \
 			       rygel-media-art-store.vala \
 				   ../src/rygel/rygel-thumbnail.vala \
 				   ../src/rygel/rygel-icon-info.vala
+
+if ALWAYS_TEST
+all-local: check
+endif