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 8edd7f4de17d922f5e16d3359be1bf5ba75d52a9..e616b0ae233d6072528d7345d49d2dbb69325a05 100644 (file)
--- 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 db3f7a54be6c165c4edd876e79c2f10155d813fa..118db281c74b7ede4956907f45883c751c11ec4d 100644 (file)
--- 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 5eb7367e3c55298ee9053ea7f6693247872f92b2..02164858bf2b2077c24aaa93114237e51c92fba9 100644 (file)
--- 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"