← Back to branch summary

~unity8-desktop-session-team/indicator-session/indicator-session-using-upstart

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Charles Kerr
  • Date: 2012-04-27 20:17:47 UTC
  • mfrom: (254.2.2 gtest)
  • mto: This revision was merged to the branch mainline in revision 255.
  • Revision ID: charles.kerr@canonical.com-20120427201747-hcs7a52v9wdaf614
use ted's suggestions for using xorg-gtest and to remove the service-test-runner.sh script

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
183
183
if test "x$enable_tests" != "xno"; then
184
184
    m4_include([m4/gtest.m4])
185
185
    CHECK_GTEST
 
186
    CHECK_XORG_GTEST
186
187
    if test "x$enable_tests" = "xauto"; then
187
188
        enable_tests=${have_gtest}
188
189
    elif test "x$enable_tests" = "xyes" && test "x$have_gtest" != "xyes"; then
189
190
        AC_MSG_ERROR([tests were requested but gtest is not installed.])
190
191
    fi
191
192
    if test "x$enable_tests" = "xyes"; then
192
 
        PKG_CHECK_MODULES([TEST_SERVICE],[indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
 
193
        PKG_CHECK_MODULES([TEST_SERVICE],[indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
193
194
                                          dbustest-1 >= $DBUSTEST_REQUIRED_VERSION
194
195
                                          dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION])
195
196
    fi