diff options
| author | Allan LeSage <allanlesage@gmail.com> | 2012-03-20 19:03:20 -0500 |
|---|---|---|
| committer | Allan LeSage <allanlesage@gmail.com> | 2012-03-20 19:03:20 -0500 |
| commit | e4db178a1b250394c121760411d1c774e898ab25 (patch) | |
| tree | e263d57957ceaf2f60c03c11df6ba01b7d3ab7e4 | |
| parent | dcd64738bfb7a4060080526203fa68e9c176e48b (diff) | |
| download | ayatana-indicator-messages-e4db178a1b250394c121760411d1c774e898ab25.tar.gz ayatana-indicator-messages-e4db178a1b250394c121760411d1c774e898ab25.tar.bz2 ayatana-indicator-messages-e4db178a1b250394c121760411d1c774e898ab25.zip | |
Chase-recommended simplification of test-inclusion autoconf.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index bef67bd..4d64e31 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = \ data \ po -if BUILD_TESTS +if HAVE_GTEST SUBDIRS += \ test diff --git a/configure.ac b/configure.ac index a429d17..a5ca692 100644 --- a/configure.ac +++ b/configure.ac @@ -77,15 +77,6 @@ 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 ########################### @@ -126,6 +117,7 @@ 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 |