[Pkg-gnupg-commit] [gnupg2] 158/241: gpg: If sqlite is not available, don't build things depending on it.

[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 770c06ed4e6c1097d6e305a0a9427c3c783b787c
Author: Neal H. Walfield <neal at g10code.com>
Date:   Mon Nov 23 12:39:22 2015 +0100

    gpg: If sqlite is not available, don't build things depending on it.
    
    * configure.ac: Define the automake conditional SQLITE3.
    * tests/openpgp/Makefile.am (TESTS): Move the sqlite3 dependent tests
    to...
    (sqlite3_dependent_tests): ... this new variable.  If SQLITE3 is not
    defined, then clear this variable.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
---
 configure.ac              | 2 ++
 tests/openpgp/Makefile.am | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 57bf85e..d9aac71 100644
--- a/configure.ac
+++ b/configure.ac
@@ -820,6 +820,8 @@ if test x"$use_tofu" = xyes ; then
   fi
 fi
 
+AM_CONDITIONAL(SQLITE3, test "$have_sqlite" = "yes")
+
 if test x"$use_tofu" = xyes ; then
     AC_DEFINE(USE_TOFU, 1, [Enable to build the TOFU code])
 fi
diff --git a/tests/openpgp/Makefile.am b/tests/openpgp/Makefile.am
index f82fc1d..7263cd8 100644
--- a/tests/openpgp/Makefile.am
+++ b/tests/openpgp/Makefile.am
@@ -25,6 +25,12 @@ required_pgms = ../../g10/gpg2 ../../agent/gpg-agent \
 
 TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO= LC_ALL=C
 
+if SQLITE3
+sqlite3_dependent_tests = tofu.test
+else
+sqlite3_dependent_tests =
+endif
+
 # Note: version.test needs to be the first test to run and finish.test
 # the last one
 TESTS = version.test mds.test \
@@ -38,7 +44,8 @@ TESTS = version.test mds.test \
 	armdetachm.test detachm.test genkey1024.test \
 	conventional.test conventional-mdc.test \
 	multisig.test verify.test armor.test \
-	import.test ecc.test 4gb-packet.test tofu.test \
+	import.test ecc.test 4gb-packet.test \
+	$(sqlite3_dependent_tests) \
 	finish.test
 
 

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