From: Colin Walters <walters@verbum.org>
Date: Sat, 8 Jul 2023 19:42:12 +0000 (-0400)
Subject: build-sys: Add libsodium to OT_DEP_CRYPTO
X-Git-Tag: archive/raspbian/2023.7-3+rpi1~1^2~9^2^2~61^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=265cf7d786ffa3972d1698aeeb8bb4e5b50385b5;p=ostree.git

build-sys: Add libsodium to OT_DEP_CRYPTO

There's no reason to have these distinct really.  If we're using
libsodium, we want it in the same places we're using openssl.

Prep for further refactoring.
---

diff --git a/Makefile-libostree.am b/Makefile-libostree.am
index 8edd7f4d..e616b0ae 100644
--- a/Makefile-libostree.am
+++ b/Makefile-libostree.am
@@ -262,11 +262,6 @@ libostree_1_la_SOURCES += \
 	src/libostree/ostree-sign-private.h \
 	$(NULL)
 
-if USE_LIBSODIUM
-libostree_1_la_CFLAGS += $(OT_DEP_LIBSODIUM_CFLAGS)
-libostree_1_la_LIBADD += $(OT_DEP_LIBSODIUM_LIBS)
-endif # USE_LIBSODIUM
-
 if USE_COMPOSEFS
 libostree_1_la_LIBADD += libcomposefs.la
 endif # USE_COMPOSEFS
diff --git a/Makefile-ostree.am b/Makefile-ostree.am
index db3f7a54..118db281 100644
--- a/Makefile-ostree.am
+++ b/Makefile-ostree.am
@@ -153,8 +153,3 @@ if USE_LIBARCHIVE
 ostree_CFLAGS += $(OT_DEP_LIBARCHIVE_CFLAGS)
 ostree_LDADD += $(OT_DEP_LIBARCHIVE_LIBS)
 endif
-
-if USE_LIBSODIUM
-ostree_CFLAGS += $(OT_DEP_LIBSODIUM_CFLAGS)
-ostree_LDADD += $(OT_DEP_LIBSODIUM_LIBS)
-endif # USE_LIBSODIUM
diff --git a/configure.ac b/configure.ac
index 5eb7367e..02164858 100644
--- a/configure.ac
+++ b/configure.ac
@@ -465,6 +465,10 @@ AS_IF([ test $with_crypto = gnutls ], [
 AM_CONDITIONAL(USE_GNUTLS, test $with_crypto = gnutls)
 dnl end gnutls
 
+dnl we always inject libsodium into our crypto deps in addition to openssl/gnutls
+OT_DEP_CRYPTO_CFLAGS="${OT_DEP_CRYPTO_CFLAGS} ${OT_DEP_LIBSODIUM_CFLAGS}"
+OT_DEP_CRYPTO_LIBS="${OT_DEP_CRYPTO_LIBS} ${OT_DEP_LIBSODIUM_LIBS}"
+
 dnl Avahi dependency for finding repos
 AVAHI_DEPENDENCY="avahi-client >= 0.6.31 avahi-glib >= 0.6.31"