diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-04-26 16:37:10 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-04-26 16:37:10 -0500 |
| commit | 1bab86efd3e4637d61e20364c2859982605850b1 (patch) | |
| tree | 3fa93128d9f9767dfcf87953a330a33756046460 | |
| parent | 149989e0d32b29544c4d1b6a2dcef35645e29a62 (diff) | |
| download | ayatana-indicator-session-1bab86efd3e4637d61e20364c2859982605850b1.tar.gz ayatana-indicator-session-1bab86efd3e4637d61e20364c2859982605850b1.tar.bz2 ayatana-indicator-session-1bab86efd3e4637d61e20364c2859982605850b1.zip | |
sync with the other indicatorsGTest automake rules
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | tests/Makefile.am | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 476fc2e..e90a05e 100644 --- a/configure.ac +++ b/configure.ac @@ -189,10 +189,14 @@ if test "x$enable_tests" != "xno"; then AC_MSG_ERROR([tests were requested but gtest is not installed.]) fi if test "x$enable_tests" = "xyes"; then - PKG_CHECK_MODULES(LIBDBUSTEST, dbustest-1 >= DBUSTEST_REQUIRED_VERSION) + PKG_CHECK_MODULES([TEST_SERVICE],[indicator-0.4 >= $INDICATOR_REQUIRED_VERSION + dbustest-1 >= $DBUSTEST_REQUIRED_VERSION + dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION]) fi fi AM_CONDITIONAL([BUILD_TESTS],[test "x$enable_tests" = "xyes"]) +AC_SUBST([TEST_SERVICE_CFLAGS]) +AC_SUBST([TEST_SERVICE_LDFLAGS]) ############################## # Custom Junk @@ -279,6 +283,6 @@ SUS Indicator Configuration: Indicator GTK: $with_gtk Logout Helper: $have_gtklogouthelper APT support: $enable_apt - Enable tests: $enable_tests + Unit Tests: $enable_tests Coverage reporting: $use_gcov ]) diff --git a/tests/Makefile.am b/tests/Makefile.am index 85df398..c03af4c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,9 +1,10 @@ -AM_CPPFLAGS = $(GTEST_CPPFLAGS) $(SESSIONSERVICE_CFLAGS) $(LIBDBUSTEST_CFLAGS) -I${top_srcdir}/src -Wall -Werror +AM_CPPFLAGS = $(GTEST_CPPFLAGS) $(INDICATOR_CFLAGS) -I${top_srcdir}/src -Wall -Werror AM_CXXFLAGS = $(GTEST_CXXFLAGS) check_PROGRAMS = test-service test_service_SOURCES = test-service.cc -test_service_LDADD = $(SESSIONSERVICE_LIBS) $(LIBDBUSTEST_LIBS) libgtest.a +test_service_LDADD = $(TEST_SERVICE_LIBS) libgtest.a +test_service_CPPFLAGS = $(TEST_SERVICE_CFLAGS) $(AM_CPPFLAGS) check_LIBRARIES = libgtest.a nodist_libgtest_a_SOURCES = \ |