MFB51: Final fix for gcov generation.

diff --git a/Makefile.gcov b/Makefile.gcov
index d19c8e449efa2c6b050640c53731d839e6d593c0..4276bd85f8550a44c8e9760a539cf269e9ab8115 100644 (file)
--- a/Makefile.gcov
+++ b/Makefile.gcov
@@ -57,7 +57,7 @@ php_lcov.info: lcov-test
        done
        @echo 
        @echo "Generating $@"
-       @$(LTP) --directory lcov_data/ --capture --output-file $@ --test-name PHP_LCOV
+       @$(LTP) --directory lcov_data/ --capture --base-directory=lcov_data --output-file $@
 
 lcov-html: php_lcov.info
        @echo "Generating lcov HTML"

diff --git a/configure.in b/configure.in
index aed49e2d1787c76bb328664b1098db8e22edc33f..0a91d729ad99eecd2587f51bc57ef37266585787 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -617,7 +617,7 @@ if test "$PHP_GCOV" = "yes"; 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"
+  ltp_version_list="1.5"
 
   AC_CHECK_PROG(LTP, lcov, lcov)
   AC_CHECK_PROG(LTP_GENHTML, genhtml, genhtml)