[git] KSBA - branch, master, updated. libksba-1.3.5-14-gaf99234

[by Marcus Brinkmann]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "KSBA is a library to access X.509 certificates and CMS data.".

The branch, master has been updated
       via  af99234b21c98ad1a4eaf2b72fb52de67beba9d3 (commit)
      from  457d2f0c6a1fea394de6d48afb1c1c0189c52878 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit af99234b21c98ad1a4eaf2b72fb52de67beba9d3
Author: Marcus Brinkmann <marcus.brinkmann at ruhr-uni-bochum.de>
Date:   Tue Aug 22 15:08:24 2017 +0200

    Fix make distcheck.
    
    * configure.ac: Revert last change and define HAVE_GCOV if not
    in maintainer mode.
    * tests/detached-sig.csm: New file.
    * tests/Makefile.am (EXTRA_DIST): Add detached-sig.csm.
    * tests/t-cms-parser.c (main): Use detached-sig.csm as test file.
    
    Signed-off-by: Marcus Brinkmann <mb at g10code.com>

diff --git a/configure.ac b/configure.ac
index 54d4787..4f8928d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,12 +127,14 @@ gl_EARLY
 AC_PROG_YACC
 AX_PROG_BISON([have_bison=yes],[have_bison=no])
 
-AC_CHECK_PROGS(GCOV, [gcov], gcov)
 if test "$USE_MAINTAINER_MODE" = "yes"; then
+	AC_CHECK_PROGS(GCOV, [gcov], gcov)
 	# gcov coverage reporting
 	AC_TDD_GCOV
 	AC_SUBST(COVERAGE_CFLAGS)
 	AC_SUBST(COVERAGE_LDFLAGS)
+else
+	AM_CONDITIONAL(HAVE_GCOV, false)
 fi
 
 AC_C_INLINE
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f6436df..fd590ba 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -34,7 +34,7 @@ test_crls = samples/ov-test-crl.crl
 test_keys = samples/ov-server.p12  samples/ov-userrev.p12 \
              samples/ov-serverrev.p12  samples/ov-user.p12
 
-EXTRA_DIST = $(test_certs) samples/README mkoidtbl.awk
+EXTRA_DIST = $(test_certs) samples/README mkoidtbl.awk detached-sig.cms
 
 BUILT_SOURCES = oidtranstbl.h
 CLEANFILES = oidtranstbl.h
diff --git a/tests/detached-sig.cms b/tests/detached-sig.cms
new file mode 100644
index 0000000..9b31d88
Binary files /dev/null and b/tests/detached-sig.cms differ
diff --git a/tests/t-cms-parser.c b/tests/t-cms-parser.c
index 4b83dd7..6739b71 100644
--- a/tests/t-cms-parser.c
+++ b/tests/t-cms-parser.c
@@ -235,7 +235,7 @@ main (int argc, char **argv)
     one_file (argv[1]);
   else
     {
-      char *fname = prepend_srcdir ("extra/dsig-with-id-aa-encrypKeyPref-1.cms");
+      char *fname = prepend_srcdir ("detached-sig.cms");
 
       one_file (fname);
       free(fname);

-----------------------------------------------------------------------

Summary of changes:
 configure.ac           |   4 +++-
 tests/Makefile.am      |   2 +-
 tests/detached-sig.cms | Bin 0 -> 556 bytes
 tests/t-cms-parser.c   |   2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 tests/detached-sig.cms


hooks/post-receive
-- 
KSBA is a library to access X.509 certificates and CMS data.
http://git.gnupg.org