Merge lp:~allanlesage/unity-chromium-extension/lcov-versioning into lp:unity-chromium-extension

[Allan LeSage]

Chop out that pesky lcov versioning code from m4/gcov--it was interfering with our coverage build.

Need this for lp:coverage-builder testing, as this is one of very few remaining autotools projects, want to demonstrate we can support.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:248
http://jenkins.qa.ubuntu.com/job/unity-chromium-extension-ci/32/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-chromium-extension-utopic-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-chromium-extension-utopic-armhf-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-chromium-extension-ci/32/rebuild

review: Approve (continuous-integration)

Unmerged revisions

248. By Allan LeSage on 2014-09-15

Correct lcov versioning problem, was breaking coverage build on trusty.

=== modified file 'm4/gcov.m4'
--- m4/gcov.m4	2013-12-23 01:17:40 +0000
+++ m4/gcov.m4	2014-09-15 18:46:02 +0000
@@ -33,33 +33,12 @@
     AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
   fi
 
-  lcov_version_list="1.6 1.7 1.8 1.9 1.10"
   AC_CHECK_PROG(LCOV, lcov, lcov)
+  if test -z "$LCOV"; then
+    AC_MSG_ERROR([Could not find lcov])
+  fi
+
   AC_CHECK_PROG(GENHTML, genhtml, genhtml)
-
-  if test "$LCOV"; then
-    AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [
-      glib_cv_lcov_version=invalid
-      lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'`
-      for lcov_check_version in $lcov_version_list; do
-        if test "$lcov_version" = "$lcov_check_version"; then
-          glib_cv_lcov_version="$lcov_check_version (ok)"
-        fi
-      done
-    ])
-  else
-    lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list"
-    AC_MSG_ERROR([$lcov_msg])
-  fi
-
-  case $glib_cv_lcov_version in
-    ""|invalid[)]
-      lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)."
-      AC_MSG_ERROR([$lcov_msg])
-      LCOV="exit 0;"
-      ;;
-  esac
-
   if test -z "$GENHTML"; then
     AC_MSG_ERROR([Could not find genhtml from the lcov package])
   fi