security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

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@g10code.com>
This commit is contained in:
Neal H. Walfield 2015-11-23 12:39:22 +01:00
parent b64b33bb80
commit 770c06ed4e
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -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

9
tests/openpgp/Makefile.am
View File

@ -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