From 2a5ce34fce3f7ab37587b644a3f4a961204cd504 Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Mon, 21 Sep 2009 20:35:21 +0200
Subject: [PATCH] [build] Add --disable-tests to disable tests during distcheck

---
 Makefile.am  | 9 ++++++---
 configure.ac | 7 +++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7030b1b1..011d1fcd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,8 +8,11 @@ SUBDIRS = \
 	properties \
 	shell \
 	po \
-	help \
-	test
+	help
+
+if ENABLE_TESTS
+SUBDIRS += test
+endif
 
 if ENABLE_THUMBNAILER
 SUBDIRS += thumbnailer
@@ -52,7 +55,7 @@ DISTCLEANFILES = 		\
 
 ACLOCAL_AMFLAGS = -I m4
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper --enable-gtk-doc --disable-nautilus
+DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper --enable-gtk-doc --disable-nautilus --disable-tests
 
 # Ignore scrollkeeper issues for now.  @#*$& scrollkeeper
 distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper | grep -v /share/gnome/help/ | grep -v \.omf
diff --git a/configure.ac b/configure.ac
index fe198a67..6208b0c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -308,6 +308,12 @@ if test "x$enable_debug" = "xyes"; then
    DEBUG_FLAGS="-DEV_ENABLE_DEBUG"
 fi
 
+AC_ARG_ENABLE([tests],
+	AC_HELP_STRING([--enable-tests], [Disable tests]),
+	enable_tests="$enableval",
+	enable_tests=yes)
+
+AM_CONDITIONAL(ENABLE_TESTS, test x$enable_tests = xyes)
 
 LIBDOCUMENT_CFLAGS="$LIBDOCUMENT_CFLAGS $DEBUG_FLAGS"
 LIBDOCUMENT_LIBS="$LIBDOCUMENT_LIBS"
@@ -746,6 +752,7 @@ Configure summary:
 	Gtk-Doc Support....:  $enable_gtk_doc
 	Debug mode.........:  $enable_debug
 	GObj. Introspection:  $enable_introspection
+	Tests..............:  $enable_tests
 
 	PDF Backend........:  $enable_pdf
 	PostScript Backend.:  $enable_ps
-- 
2.43.5