- Fix the ccache detection.

diff --git a/Makefile.gcov b/Makefile.gcov
index 073163fe6e1c501dc8bd1b6be5808b0c58cb908c..1c06d4089984082cc27ecea04e8dbe44be53fbee 100644 (file)
--- a/Makefile.gcov
+++ b/Makefile.gcov
@@ -5,6 +5,12 @@
 
 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 ea6001470699a4af265e2511897b6065e5e073c8..e4e7f0d97eb6389d2248371ff0f6ed982623648f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -604,12 +604,19 @@ PHP_ARG_ENABLE(gcov,  whether to include gcov symbols,
 if test "$PHP_GCOV" = "yes"; then
 
   if test "$GCC" != "yes"; then
-    AC_MSG_ERROR([GCC is required to be able use --enable-gcov])
+    AC_MSG_ERROR([GCC is required for --enable-gcov])
+  fi
+  
+  dnl Check if ccache is being used
+  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"
   fi
   
-  dnl Check if we can pass GCC the --ccache-disable option
-  PHP_CHECK_GCC_ARG([--ccache-disable], [CC="$CC --ccache-disable"])
-
   ltp_version_list="1.4"
 
   AC_CHECK_PROG(LTP, lcov, lcov)
@@ -1232,7 +1239,7 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
 INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
 CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
 
-all_targets='$(OVERALL_TARGET) $(PHP_MODULES) $(PHP_CLI_TARGET)'
+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_CLI_TARGET)"
 install_targets="$install_modules install-build install-headers install-programs"
 
 case $PHP_SAPI in