[Pkg-gnupg-commit] [gnupg2] 38/241: build: Make --disable-g13 the default.

[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 485e0a221deb5c68f29b6a7a110b349dbe41c027
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 21 10:34:41 2015 +0200

    build: Make --disable-g13 the default.
    
    * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Add --enable-g13.  Remove
    --enable-gpgtar because that is enabled anyway.
    * configure.ac: Do not build g13 by default.
    --
    
    The g13 part is not very useful for a standard user right now, thus do
    not build it.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 Makefile.am  | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0613545..8e213f3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,7 @@
 ## Process this file with automake to produce Makefile.in
 
 ACLOCAL_AMFLAGS = -I m4
-DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-gpgtar
+DISTCHECK_CONFIGURE_FLAGS = --enable-symcryptrun --enable-mailto --enable-g13
 
 GITLOG_TO_CHANGELOG=gitlog-to-changelog
 
diff --git a/configure.ac b/configure.ac
index bdfff88..22d1cfc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,7 +114,7 @@ GNUPG_BUILD_PROGRAM(gpgsm, yes)
 # The agent is a required part and can't be disabled anymore.
 build_agent=yes
 GNUPG_BUILD_PROGRAM(scdaemon, yes)
-GNUPG_BUILD_PROGRAM(g13, yes)
+GNUPG_BUILD_PROGRAM(g13, no)
 GNUPG_BUILD_PROGRAM(dirmngr, yes)
 GNUPG_BUILD_PROGRAM(tools, yes)
 GNUPG_BUILD_PROGRAM(doc, yes)

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