From 87def80f115a05314b2ff25b9ed53a8112a5490f Mon Sep 17 00:00:00 2001 From: Martin Schanzenbach Date: Mon, 26 Apr 2021 10:27:26 +0200 Subject: - unconditionally build dlog --- src/util/Makefile.am | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/util/Makefile.am b/src/util/Makefile.am index f05fc7bf7..72fd37bde 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -25,10 +25,8 @@ if ENABLE_BENCHMARK PTHREAD = -lpthread endif -if HAVE_NOLIBGCRYPT19 - DLOG = crypto_ecc_dlog.c - DLOG_TEST = test_crypto_ecc_dlog -endif +DLOG = crypto_ecc_dlog.c +DLOG_TEST = test_crypto_ecc_dlog gnunet_config_diff_SOURCES = \ gnunet-config-diff.c @@ -259,11 +257,8 @@ if HAVE_BENCHMARKS perf_crypto_asymmetric \ perf_malloc \ perf_mq \ - perf_scheduler - -if HAVE_NOLIBGCRYPT19 - BENCHMARKS += perf_crypto_ecc_dlog -endif + perf_scheduler \ + perf_crypto_ecc_dlog endif if HAVE_SSH_KEY @@ -456,14 +451,12 @@ test_crypto_eddsa_LDADD = \ libgnunetutil.la \ $(LIBGCRYPT_LIBS) -if HAVE_NOLIBGCRYPT19 test_crypto_ecc_dlog_SOURCES = \ test_crypto_ecc_dlog.c test_crypto_ecc_dlog_LDADD = \ -lsodium \ libgnunetutil.la \ $(LIBGCRYPT_LIBS) -endif test_crypto_ecdhe_SOURCES = \ test_crypto_ecdhe.c @@ -606,13 +599,11 @@ perf_crypto_hash_SOURCES = \ perf_crypto_hash_LDADD = \ libgnunetutil.la -if HAVE_NOLIBGCRYPT19 perf_crypto_ecc_dlog_SOURCES = \ perf_crypto_ecc_dlog.c perf_crypto_ecc_dlog_LDADD = \ libgnunetutil.la \ -lsodium -endif perf_crypto_rsa_SOURCES = \ perf_crypto_rsa.c -- cgit v1.2.3