Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am9
-rw-r--r--configure.ac7
2 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 7030b1b..011d1fc 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 fe198a6..6208b0c 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