[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-cvs
Subject:    [PHP-CVS] cvs: php-src(PHP_5_1) / Makefile.gcov configure.in
From:       "Jani Taskinen" <sniper () php ! net>
Date:       2005-11-30 15:01:35
Message-ID: cvssniper1133362895 () cvsserver
[Download RAW message or body]

sniper		Wed Nov 30 10:01:35 2005 EDT

  Modified files:              (Branch: PHP_5_1)
    /php-src	configure.in Makefile.gcov 
  Log:
  MFH: - Fix the ccache detection
  
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.579.2.25&r2=1.579.2.26&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.579.2.25 php-src/configure.in:1.579.2.26
--- php-src/configure.in:1.579.2.25	Tue Nov 29 18:20:01 2005
+++ php-src/configure.in	Wed Nov 30 10:01:34 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.579.2.25 2005/11/29 23:20:01 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.579.2.26 2005/11/30 15:01:34 sniper Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -608,14 +608,13 @@
   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"
http://cvs.php.net/diff.php/php-src/Makefile.gcov?r1=1.4.2.2&r2=1.4.2.3&ty=u
Index: php-src/Makefile.gcov
diff -u php-src/Makefile.gcov:1.4.2.2 php-src/Makefile.gcov:1.4.2.3
--- php-src/Makefile.gcov:1.4.2.2	Tue Nov 29 18:19:55 2005
+++ php-src/Makefile.gcov	Wed Nov 30 10:01:34 2005
@@ -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

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php


[prev in list] [next in list] [prev in thread] [next in thread]