From 385314c6c7efc416d5560a89e322d502dc620d40 Mon Sep 17 00:00:00 2001
From: Mikko Koppanen <mkoppanen@php.net>
Date: Sat, 2 Apr 2011 23:22:57 +0100
Subject: [PATCH 4/4] Additional gcov changes


Signed-off-by: Mikko Koppanen <mkoppanen@php.net>
---
 acinclude.m4 |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 9c9a770..71f9b2c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -331,18 +331,28 @@ AC_DEFUN([LIBZMQ_WITH_GCOV], [{
 
     AC_MSG_CHECKING(whether to enable code coverage)
 
-    if test "x$GXX" != "xyes"; then
-        AC_MSG_ERROR([--with-gcov=yes works only with GCC])
-    fi
+    if test "x$ZMQ_GCOV" = "xyes"; then
+    
+        if test "x$GXX" != "xyes"; then
+            AC_MSG_ERROR([--with-gcov=yes works only with GCC])
+        fi
+    
+        CFLAGS="-g -O0 -fprofile-arcs -ftest-coverage"
+        if test "x${ZMQ_ORIG_CPPFLAGS}" != "xnone"; then
+            CFLAGS="${CFLAGS} ${ZMQ_ORIG_CFLAGS}"
+        fi
 
-    CFLAGS="-g -O0 -fprofile-arcs -ftest-coverage"
-    if test "x${ZMQ_ORIG_CPPFLAGS}" != "xnone"; then
-        CFLAGS="${CFLAGS} ${ZMQ_ORIG_CFLAGS}"
-    fi
+        CPPFLAGS="-g -O0 -fprofile-arcs -ftest-coverage"
+        if test "x${ZMQ_ORIG_CPPFLAGS}" != "xnone"; then
+            CPPFLAGS="${CPPFLAGS} ${ZMQ_ORIG_CPPFLAGS}"
+        fi
+
+        CXXFLAGS="-fprofile-arcs"
+        if test "x${ZMQ_ORIG_CXXFLAGS}" != "xnone"; then
+            CXXFLAGS="${CXXFLAGS} ${ZMQ_ORIG_CXXFLAGS}"
+        fi
 
-    CPPFLAGS="-g -O0 -fprofile-arcs -ftest-coverage"
-    if test "x${ZMQ_ORIG_CPPFLAGS}" != "xnone"; then
-        CPPFLAGS="${CPPFLAGS} ${ZMQ_ORIG_CPPFLAGS}"
+        LIBS="-lgcov ${LIBS}"
     fi
 
     AS_IF([test "x$ZMQ_GCOV" = "xyes"],
-- 
1.7.3.5