From 90289ea04cda325223235647d5ca4cdb9c65b05a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com> Date: Sat, 7 Apr 2018 16:27:44 -0400 Subject: [PATCH] build: always build static opendht, link libssl Change-Id: Id151ff3a40d01871b8a59349465aa40e169822c0 --- contrib/src/opendht/rules.mak | 2 +- src/Makefile.am | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/src/opendht/rules.mak b/contrib/src/opendht/rules.mak index 1408ada875..864e096737 100644 --- a/contrib/src/opendht/rules.mak +++ b/contrib/src/opendht/rules.mak @@ -36,6 +36,6 @@ opendht: opendht-$(OPENDHT_VERSION).tar.gz .opendht: opendht .sum-opendht mkdir -p $</m4 && $(RECONF) - cd $< && $(HOSTVARS) ./configure --disable-tools --disable-python --disable-doc --enable-proxy-server --enable-proxy-client --enable-push-notifications $(HOSTCONF) + cd $< && $(HOSTVARS) ./configure --enable-static --disable-shared --disable-tools --disable-python --disable-doc --enable-proxy-server --enable-proxy-client --enable-push-notifications $(HOSTCONF) cd $< && $(MAKE) install touch $@ diff --git a/src/Makefile.am b/src/Makefile.am index aaa28d8030..4f46170f8e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -60,6 +60,8 @@ libring_la_LDFLAGS = \ @OPENDHT_LIBS@ \ @SECP256K1_LIBS@ \ @ZLIB_LIBS@ \ + @LIBSSL_LIBS@ \ + @LIBCRYPTO_LIBS@ \ $(PCRE_LIBS) \ @LIBS@ -- GitLab