summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am6
-rw-r--r--src/util/Makefile.am18
2 files changed, 20 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index d8a869acb..564923e28 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,6 +45,10 @@ if HAVE_POSTGRESQL
POSTGRES_DIR = pq
endif
+if HAVE_NOLIBGCRYPT19
+ SCALARPRODUCT_DIR = scalarproduct
+endif
+
REST_DIR = rest
@@ -93,7 +97,7 @@ SUBDIRS = \
seti \
setu \
consensus \
- scalarproduct \
+ $(SCALARPRODUCT_DIR) \
revocation \
vpn \
gns \
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 6b9e083a7..e2614e5e3 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -25,6 +25,11 @@ if ENABLE_BENCHMARK
PTHREAD = -lpthread
endif
+if HAVE_NOLIBGCRYPT19
+ DLOG = crypto_ecc_dlog.c
+ DLOG_TEST = test_crypto_ecc_dlog
+endif
+
gnunet_config_diff_SOURCES = \
gnunet-config-diff.c
gnunet_config_diff_LDADD = \
@@ -58,7 +63,7 @@ libgnunetutil_la_SOURCES = \
crypto_symmetric.c \
crypto_crc.c \
crypto_ecc.c \
- crypto_ecc_dlog.c \
+ $(DLOG) \
crypto_ecc_setup.c \
crypto_hash.c \
crypto_hash_file.c \
@@ -248,7 +253,6 @@ libgnunet_plugin_test_la_LDFLAGS = \
if HAVE_BENCHMARKS
BENCHMARKS = \
perf_crypto_hash \
- perf_crypto_ecc_dlog \
perf_crypto_rsa \
perf_crypto_paillier \
perf_crypto_symmetric \
@@ -256,6 +260,10 @@ if HAVE_BENCHMARKS
perf_malloc \
perf_mq \
perf_scheduler
+
+if HAVE_NOLIBGCRYPT19
+ BENCHMARKS += perf_crypto_ecc_dlog
+endif
endif
if HAVE_SSH_KEY
@@ -287,7 +295,7 @@ check_PROGRAMS = \
test_crypto_ecdhe \
test_crypto_ecdh_eddsa \
test_crypto_ecdh_ecdsa \
- test_crypto_ecc_dlog \
+ $(DLOG_TEST) \
test_crypto_hash \
test_crypto_hash_context \
test_crypto_hkdf \
@@ -448,11 +456,13 @@ 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 = \
libgnunetutil.la \
$(LIBGCRYPT_LIBS)
+endif
test_crypto_ecdhe_SOURCES = \
test_crypto_ecdhe.c
@@ -595,11 +605,13 @@ 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 \
-lgcrypt
+endif
perf_crypto_rsa_SOURCES = \
perf_crypto_rsa.c