No need to check for the 'check' framework any more

diff --git a/Makefile.am b/Makefile.am
index 3f0d4b87bf51de12bb41ca359b362dab9ed2aaa6..5f03746f261c63eb225c08220156ef7db7b77c8e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,9 @@
-SUBDIRS = tools extensions po data libempathy libempathy-gtk src help
+SUBDIRS = tools extensions po data libempathy libempathy-gtk src help tests
 
 if HAVE_NST
 SUBDIRS += nautilus-sendto-plugin
 endif
 
-if HAVE_TESTS
-SUBDIRS += tests
-endif
-
 ACLOCAL_AMFLAGS = -I m4
 
 DISTCHECK_CONFIGURE_FLAGS =            \

diff --git a/configure.ac b/configure.ac
index 67fbd4368cf2c4ce485e46e7afca736c1e165fdb..df9b16cc787367e20ccc311225732f76aa0b41ee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -420,29 +420,6 @@ fi
 
 AM_CONDITIONAL(HAVE_NST, test "x$have_nst" = "xyes")
 
-# -----------------------------------------------------------
-# Tests
-# -----------------------------------------------------------
-AC_ARG_ENABLE(tests,
-              AS_HELP_STRING([--enable-tests=@<:@no/yes/auto@:>@],
-                             [build tests]), ,
-                             enable_tests=auto)
-
-if test "x$enable_tests" != "xno"; then
-   PKG_CHECK_MODULES(CHECK,
-   [
-      check >= 0.9.4
-   ], have_check="yes", have_check="no")
-else
-   have_check=no
-fi
-
-if test "x$enable_tests" = "xyes" -a "x$have_check" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find check dependencies.])
-fi
-
-AM_CONDITIONAL(HAVE_TESTS, test "x$have_check" = "xyes")
-
 # -----------------------------------------------------------
 # Coding style checks
 # -----------------------------------------------------------
@@ -483,7 +460,6 @@ Configure summary:
        Compiler Flags..............:  ${CFLAGS} ${ERROR_CFLAGS}
        Prefix......................:  ${prefix}
        Shaved build................:  ${enable_shave}
-       Tests.......................:  ${have_check}
        Coding style checks.........:  ${ENABLE_CODING_STYLE_CHECKS}
 
     Features: