From: foobar <sniper@php.net>
Date: Wed, 30 Nov 2005 15:01:22 +0000 (+0000)
Subject: - Fix the ccache detection
X-Git-Tag: RELEASE_2_0_2~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13c1c6c15d67741d8669fd5648bd0f7c9c607d01;p=php

- Fix the ccache detection
---

diff --git a/Makefile.gcov b/Makefile.gcov
index 1c06d40899..073163fe6e 100644
--- a/Makefile.gcov
+++ b/Makefile.gcov
@@ -5,12 +5,6 @@
 
 lcov: lcov-html
 
-lcov-ccache:
-	@if test -z "$(CCACHE_DISABLE)" || test "$(CCACHE_DISABLE)" != "1"; then \
-		echo "ccache is not disabled. Set environment variable CCACHE_DISABLE=1 to disable ccache."; \
-		exit 123; \
-	fi
-
 lcov-test: all
 	@echo "Running test suite"
 	@find . -name \*.gcda | xargs rm -f
diff --git a/configure.in b/configure.in
index c944290187..aed49e2d17 100644
--- a/configure.in
+++ b/configure.in
@@ -608,14 +608,13 @@ if test "$PHP_GCOV" = "yes"; then
   fi
   
   dnl Check if ccache is being used
-  dnl FIXME: Need a check for ccache usage, the one below does not work!
-  PHP_CHECK_GCC_ARG([--ccache-skip], [gcc_ccache=yes])
-  
-  if test "$gcc_ccache" = "yes"; then
-    if test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"; then
-      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_target="lcov-ccache"
+  case `$php_shtool path $CC` in
+    *ccache*[)] gcc_ccache=yes;;
+    *[)] gcc_ccache=no;;
+  esac
+
+  if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
+    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
   
   ltp_version_list="1.4"