Merge branch 'master' into segwit

This commit is contained in:
Luke Dashjr 2016-11-22 11:02:04 +00:00
commit 8b28f02857

View File

@ -52,7 +52,7 @@ dist_noinst_DATA = \
testinput.c
if HAVE_LIBGCRYPT
noinst_PROGRAMS = test
check_PROGRAMS = test
test_SOURCES = test.c
test_CFLAGS = $(libbase58_CFLAGS) $(JANSSON_CFLAGS) $(LIBGCRYPT_CFLAGS)
test_LDADD = $(libbase58_LIBS) libblkmaker-@LIBBLKMAKER_API_VERSION@.la libblkmaker_jansson-@LIBBLKMAKER_API_VERSION@.la $(JANSSON_LIBS) $(LIBGCRYPT_LIBS)