aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac10
2 files changed, 10 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 4d64e31..bef67bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = \
data \
po
-if HAVE_GTEST
+if BUILD_TESTS
SUBDIRS += \
test
diff --git a/configure.ac b/configure.ac
index a5ca692..a429d17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,6 +77,15 @@ AC_SUBST(APPLET_CFLAGS)
AC_SUBST(APPLET_LIBS)
###########################
+# Test Dependencies
+###########################
+
+AC_ARG_ENABLE([tests],
+ AC_HELP_STRING([--disable-tests], [Disable test scripts and tools]),,
+ [enable_tests=auto])
+AM_CONDITIONAL(BUILD_TESTS, test xyes = xyes)
+
+###########################
# Status Provider Deps
###########################
@@ -117,7 +126,6 @@ AC_SUBST(COVERAGE_LDFLAGS)
m4_include([m4/gtest.m4])
CHECK_GTEST
-AM_CONDITIONAL([HAVE_GTEST], [test "x$have_gtest" = xyes])
###########################
# Check to see if we're local