[cutter-commit 04459] clear-code/cutter@6ba6f86 [master] Don't require LCOV for just generating coverage info

[Kouhei S. <nul...@cl...>]

Kouhei Sutou	2014-01-24 10:02:58 +0900 (Fri, 24 Jan 2014)

  New Revision: 6ba6f86fd1039fb6f4b511892f0007a45f58a83b
  https://github.com/clear-code/cutter/commit/6ba6f86fd1039fb6f4b511892f0007a45f58a83b

  Message:
    Don't require LCOV for just generating coverage info
    
    LCOV is still required to generate a coverage report.

  Modified files:
    configure.ac
    m4macros/cutter.m4

  Modified: configure.ac (+1 -0)
===================================================================
--- configure.ac    2014-01-24 00:42:35 +0900 (b2669fb)
+++ configure.ac    2014-01-24 10:02:58 +0900 (e21778a)
@@ -1040,6 +1040,7 @@ echo "Configure Result:"
 echo
 echo " Options:"
 echo "  coverage                         : $cutter_enable_coverage"
+echo "  coverage report by LCOV          : $cutter_enable_coverage_report_lcov"
 echo
 echo " Libraries:"
 echo "  GLib <= 2.12                     : $glib_2_12"

  Modified: m4macros/cutter.m4 (+11 -6)
===================================================================
--- m4macros/cutter.m4    2014-01-24 00:42:35 +0900 (1642289)
+++ m4macros/cutter.m4    2014-01-24 10:02:58 +0900 (1b97644)
@@ -1,10 +1,13 @@
 AC_DEFUN([AC_CHECK_ENABLE_COVERAGE],
 [
+  AC_MSG_CHECKING([for enabling coverage])
   AC_ARG_ENABLE([coverage],
                 AS_HELP_STRING([--enable-coverage],
                                [Enable coverage]),
                 [cutter_enable_coverage=$enableval],
                 [cutter_enable_coverage=no])
+  AC_MSG_RESULT($cutter_enable_coverage)
+  cutter_enable_coverage_report_lcov=no
   if test "x$cutter_enable_coverage" != "xno"; then
     ltp_version_list="1.6 1.7 1.8 1.9 1.10"
     AC_PATH_TOOL(LCOV, lcov)
@@ -24,17 +27,17 @@ AC_DEFUN([AC_CHECK_ENABLE_COVERAGE],
       ])
     fi
 
+    AC_MSG_CHECKING([for enabling coverage report by LCOV])
     case "$cutter_cv_ltp_version" in
       *\(ok\)*)
-        cutter_enable_coverage=yes
+        cutter_enable_coverage_report_lcov=yes
         ;;
       *)
-        cutter_enable_coverage=no
+        cutter_enable_coverage_report_lcov=no
         ;;
     esac
+    AC_MSG_RESULT($cutter_enable_coverage_report_lcov)
   fi
-  AC_MSG_CHECKING([for enabling coverage])
-  AC_MSG_RESULT($cutter_enable_coverage)
 ])
 
 AC_DEFUN([AC_CHECK_COVERAGE],
@@ -56,6 +59,8 @@ AC_DEFUN([AC_CHECK_COVERAGE],
   AC_SUBST(COVERAGE_CFLAGS)
   AC_SUBST(COVERAGE_LIBS)
   AM_CONDITIONAL([ENABLE_COVERAGE], [test "$cutter_enable_coverage" = "yes"])
+  AM_CONDITIONAL([ENABLE_COVERAGE_REPORT_LCOV],
+                 [test "$cutter_enable_coverage_report_lcov" = "yes"])
 
   COVERAGE_INFO_FILE="coverage.info"
   AC_SUBST(COVERAGE_INFO_FILE)
@@ -68,8 +73,8 @@ AC_DEFUN([AC_CHECK_COVERAGE],
   fi
   AC_SUBST(GENHTML_OPTIONS)
 
-  if test "$cutter_enable_coverage" = "yes"; then
-    AC_CONFIG_COMMANDS([coverage], [
+  if test "$cutter_enable_coverage_report_lcov" = "yes"; then
+    AC_CONFIG_COMMANDS([coverage-report-lcov], [
       if test -e "$ac_check_coverage_makefile" && \
          grep -q '^coverage:' $ac_check_coverage_makefile; then
         : # do nothing