[Pkg-gnupg-commit] [gnupg1] 17/30: build: Avoid check gpg --version during make distcheck.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository gnupg1.

commit 9937aa8fdad613b9bb7786cebb3b39e0186001e1
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Jul 19 10:55:44 2017 +0200

    build: Avoid check gpg --version during make distcheck.
    
    --
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 g10/Makefile.am | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/g10/Makefile.am b/g10/Makefile.am
index 60e7e11..b5e4ede 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -32,7 +32,16 @@ endif
 needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
 other_libs = $(LIBICONV) $(DNSLIBS) $(LIBINTL) $(CAPLIBS)
 
+
 bin_PROGRAMS = gpg gpgv
+
+# "make distcheck" runs "gpg --version" which unfortunately may print
+# warnings about unsupported options to stderr which make distcheck
+# rejects.  I am not sure on how to pass the envvar GNUPGHOME to that
+# gpg invocation to make sure that a gpg.conf from gnupg 2 is not
+# used.  The easiest way to avoid that is to not run this extra test.
+AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = gpg$(EXEEXT)
+
 dist_pkgdata_DATA = options.skel
 
 if ENABLE_BZIP2_SUPPORT

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