aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2012-01-13 12:56:50 +0100
committerTed Gould <ted@gould.cx>2012-01-13 12:56:50 +0100
commitc3c1ebbbdac237f775fe38860aab2857389bb66f (patch)
treefbdc8212202be61b4841c8191c7ca4fdac28b51e
parenta5c78749b6a655f3f54d2d9f69302b11d53a3059 (diff)
parentc0ac60b8fc5a146e22412d90ba7f2a38d99c157b (diff)
downloadlibayatana-indicator-c3c1ebbbdac237f775fe38860aab2857389bb66f.tar.gz
libayatana-indicator-c3c1ebbbdac237f775fe38860aab2857389bb66f.tar.bz2
libayatana-indicator-c3c1ebbbdac237f775fe38860aab2857389bb66f.zip
Adding ability to disable tests
-rw-r--r--Makefile.am10
-rw-r--r--configure.ac9
2 files changed, 16 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 3bd312e..807cad0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,13 +2,17 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
SUBDIRS = \
libindicator \
- tests \
tools
-tests: libindicator
-
tools: libindicator
+if WANT_TESTS
+SUBDIRS += \
+ tests
+
+tests: libindicator
+endif
+
DISTCHECK_CONFIGURE_FLAGS = --disable-deprecations
DISTCLEANFILES = \
diff --git a/configure.ac b/configure.ac
index 2357f13..a2c39b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,6 +108,14 @@ AC_DEFINE_PATH(SYSCONFDIR, "${sysconfdir}", [system configuration dir])
AC_DEFINE_PATH(LIBDIR, "${libdir}", [system configuration dir])
#########################
+# Check if build tests
+#########################
+AC_ARG_ENABLE([tests],
+ AC_HELP_STRING([--disable-tests], [disable tests]),,
+ [enable_tests=yes])
+AM_CONDITIONAL([WANT_TESTS], [test "x$enable_tests" != "xno"])
+
+#########################
# Debug symbols
#########################
AC_ARG_ENABLE([debug],
@@ -146,5 +154,6 @@ Libindicator Configuration:
Prefix: $prefix
GTK+ Version: $with_gtk
+ Enable tests: $enable_tests
Enable debugging: $enable_debug
])