[Pkg-gnupg-commit] [gnupg2] 107/116: build: Change make distcheck configure and temp. remove gpgconf.scm.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 25e029823813e190a18b601af60efcb1fb3b84af
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jan 23 21:14:32 2017 +0100

    build: Change make distcheck configure and temp. remove gpgconf.scm.
    
    * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Also test gpgtar and
    wks-tools.  Disable ntbtls.
    * tests/openpgp/Makefile.am (XTESTS): Temporary remove gpgconf.scm.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 Makefile.am               | 2 +-
 tests/openpgp/Makefile.am | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 735c72b..e220f8b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-g13 \
-  --enable-gpg2-is-gpg
+  --enable-gpg2-is-gpg --enable-gpgtar --enable-wks-tools --disable-ntbtls
 
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
 
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index d1dd449..05341fb 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -92,12 +92,15 @@ XTESTS = \
 	quick-key-manipulation.scm \
 	key-selection.scm \
 	delete-keys.scm \
-	gpgconf.scm \
 	issue2015.scm \
 	issue2346.scm \
 	issue2417.scm \
 	issue2419.scm
 
+# Fixme: gpgconf.scm does not yet work with make distcheck.
+#	gpgconf.scm
+
+
 # XXX: Currently, one cannot override automake's 'check' target.  As a
 # workaround, we avoid defining 'TESTS', thus automake will not emit
 # the 'check' target.  For extra robustness, we merely define a

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git