cvs: php-src / Makefile.gcov configure.in

sniper Wed Nov 9 14:55:28 2005 EDT Modified files: /php-src Makefile.gcov configure.in Log: - Fix the ccache detection. http://cvs.php.net/diff.php/php-src/Makefile.gcov?r1=1.3&r2=1.4&ty=u Index: php-src/Makefile.gcov diff -u php-src/Makefile.gcov:1.3 php-src/Makefile.gcov:1.4 --- php-src/Makefile.gcov:1.3 Tue Nov 8 15:27:08 2005 +++ php-src/Makefile.gcov Wed Nov 9 14:55:25 2005 @@ -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 http://cvs.php.net/diff.php/php-src/configure.in?r1=1.590&r2=1.591&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.590 php-src/configure.in:1.591 --- php-src/configure.in:1.590 Sun Nov 6 17:44:05 2005 +++ php-src/configure.in Wed Nov 9 14:55:25 2005 @@ -1,4 +1,4 @@ - ## $Id: configure.in,v 1.590 2005/11/06 22:44:05 sniper Exp $ -*- autoconf -*- + ## $Id: configure.in,v 1.591 2005/11/09 19:55:25 sniper Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -604,12 +604,19 @@ 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 @@ 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