diff options
| author | Allan LeSage <allanlesage@gmail.com> | 2012-03-21 10:22:50 -0500 |
|---|---|---|
| committer | Allan LeSage <allanlesage@gmail.com> | 2012-03-21 10:22:50 -0500 |
| commit | 0e5b8f77b3320b12f497153b7a781272aacac00a (patch) | |
| tree | 9be4ee3de485aff2d10189cbceac8d396eb08460 | |
| parent | 1985b73f61e084b60ed9f64de78f541f57059f9d (diff) | |
| download | ayatana-indicator-messages-0e5b8f77b3320b12f497153b7a781272aacac00a.tar.gz ayatana-indicator-messages-0e5b8f77b3320b12f497153b7a781272aacac00a.tar.bz2 ayatana-indicator-messages-0e5b8f77b3320b12f497153b7a781272aacac00a.zip | |
Reverted r268, restored BUILD_TESTS; ted explains upstream arch patch.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 10 |
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 |