diff --git a/Makefile.am b/Makefile.am index ff4c9ec..b7a95a2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,13 +51,13 @@ dist_noinst_DATA = \ example.c \ testinput.c +if HAVE_LIBGCRYPT noinst_PROGRAMS = test test_SOURCES = test.c -test_CFLAGS = $(libbase58_CFLAGS) $(JANSSON_CFLAGS) -test_LDADD = $(libbase58_LIBS) libblkmaker-@LIBBLKMAKER_API_VERSION@.la libblkmaker_jansson-@LIBBLKMAKER_API_VERSION@.la $(JANSSON_LIBS) +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) TESTS = test -if CAN_COMPILE_EXAMPLE EXTRA_PROGRAMS = example example_SOURCES = example.c example_CFLAGS = $(libbase58_CFLAGS) $(JANSSON_CFLAGS) $(LIBGCRYPT_CFLAGS) diff --git a/configure.ac b/configure.ac index 4671ca7..8072702 100644 --- a/configure.ac +++ b/configure.ac @@ -51,18 +51,18 @@ PKG_CHECK_MODULES([libbase58],[libbase58]) AC_CHECK_LIB([ws2_32], [strchr]) -dnl libgcrypt necessary to build example.c with "make example" +dnl libgcrypt necessary to build tests and example dnl check for libgcrypt: m4_ifdef([AM_PATH_LIBGCRYPT], [ AM_PATH_LIBGCRYPT([], [ - can_compile_example=yes + have_libgcrypt=yes ],[ - can_compile_example=no + have_libgcrypt=no ]) ],[ - m4_warn([syntax], [AM_PATH_LIBGCRYPT missing; example will not be available]) + m4_warn([syntax], [AM_PATH_LIBGCRYPT missing; example and tests will not be available]) ]) -AM_CONDITIONAL([CAN_COMPILE_EXAMPLE], [test x$can_compile_example = xyes]) +AM_CONDITIONAL([HAVE_LIBGCRYPT], [test x$have_libgcrypt = xyes]) AC_OUTPUT diff --git a/test.c b/test.c index 5c786e9..191d9c9 100644 --- a/test.c +++ b/test.c @@ -10,10 +10,17 @@ #include #include +#include + #include "blktemplate.h" #include "blkmaker.h" #include "blkmaker_jansson.h" +static bool my_sha256(void *digest, const void *buffer, size_t length) { + gcry_md_hash_buffer(GCRY_MD_SHA256, digest, buffer, length); + return true; +} + static void capabilityname_test() { for (unsigned int i = 0; i < GBT_CAPABILITY_COUNT; ++i) { const gbt_capabilities_t capid = (1 << i); @@ -423,6 +430,8 @@ static void blktmpl_jansson_bip9() { } int main() { + blkmk_sha256_impl = my_sha256; + puts("capabilityname"); capabilityname_test();