aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.test.include
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-02-04 17:43:10 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2016-02-04 17:43:19 +0100
commit152a8216cc7b170eed26ee4c3a65dbe592e55f05 (patch)
treee996b24909e3448d86a77c39057972186b9d16ff /src/Makefile.test.include
parentd2228384de3a870803697a6cc95467b97e9a37a5 (diff)
parent42407ed43ad24ac1016eb457a7b0e720e63188cd (diff)
Merge #7349: Build against system UniValue when available
42407ed build-unix: Update UniValue build conditions (Luke Dashjr) cdcad9f LDADD dependency order shuffling (Luke Dashjr) 62f7f2e Bugfix: Always include univalue in DIST_SUBDIRS (Luke Dashjr) 2356515 Change default configure option --with-system-univalue to "no" (Luke Dashjr) 5d3b29b doc: Add UniValue to build instructions (Luke Dashjr) ab22705 Build against system UniValue when available (Luke Dashjr) 2adf7e2 Bugfix: The var is LIBUNIVALUE,not LIBBITCOIN_UNIVALUE (Luke Dashjr)
Diffstat (limited to 'src/Makefile.test.include')
-rw-r--r--src/Makefile.test.include2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index b22b8b8b96..468d3043a7 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -129,7 +129,9 @@ check-local:
@echo "Running test/bitcoin-util-test.py..."
$(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py
$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
+if EMBEDDED_UNIVALUE
$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue check
+endif
%.json.h: %.json
@$(MKDIR_P) $(@D)