Merge lp:~bregma/nux/fix-gmock-detection into lp:nux

[Stephen M. Webb]

Apdated gmock detection after gmock was updated.

Apdated gmock detection after gmock was updated. Fixes build failures due to missing check-headless target.

[Brandon Schaefer (brandontschaefer)]

LGTM, and confirmed working!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:809
http://jenkins.qa.ubuntu.com/job/nux-ci/66/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-amd64-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-armhf-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/nux-saucy-i386-ci/18

Click here to trigger a rebuild:
http://s-jenkins:8080/job/nux-ci/66/rebuild

review: Approve (continuous-integration)

=== modified file 'm4/gtest.m4'
--- m4/gtest.m4	2013-07-18 15:56:35 +0000
+++ m4/gtest.m4	2013-08-15 01:57:01 +0000
@@ -35,8 +35,8 @@
   AC_ARG_VAR([GMOCK_CPPFLAGS],
              [C preprocessor flags for Google Mock.])
 
-  gmock_includes=
   gmock_prefix=/usr/src/gmock
+  gmock_includes=$gmock_prefix/gtest/include
   AC_ARG_WITH([gmock-prefix],[
     AS_HELP_STRING([--with-gmock-prefix],
                    [Prefix where Google Mock is installed (default $gmock_prefix)])