[empathy] No need to check for the 'check' framework any more



commit d5c310f183d31c529f26d31ef79ac7e02662d4ee
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Thu Oct 29 16:21:05 2009 +0100

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

 Makefile.am  |    6 +-----
 configure.ac |   24 ------------------------
 2 files changed, 1 insertions(+), 29 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3f0d4b8..5f03746 100644
--- 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 67fbd43..df9b16c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -421,29 +421,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
 # -----------------------------------------------------------
 AC_ARG_ENABLE(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:



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]