From 0972070b38739c17effe986542c98878fe880e99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
 <sebastien.blin@savoirfairelinux.com>
Date: Wed, 26 Apr 2023 14:32:53 -0400
Subject: [PATCH] build: link archive before ssl

Change-Id: Ie1e33d9638f2ab616764c8c29e877bdbf3b7f1ea
---
 src/Makefile.am | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 014fd42d8b..b8ee1308a9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,6 +18,14 @@ include ./sip/Makefile.am
 
 # libjami
 
+if ENABLE_PLUGIN
+if HAVE_OSX
+LIBARCHIVE = $(MINIZIP_LIBS)
+else
+LIBARCHIVE = $(ARCHIVE_LIBS)
+endif
+endif
+
 libjami_la_LIBADD += \
 	$(ALSA_LIBS) \
 	$(PULSEAUDIO_LIBS) \
@@ -25,6 +33,7 @@ libjami_la_LIBADD += \
 	$(SPEEXDSP_LIBS) \
 	$(PJPROJECT_LIBS) \
 	$(OPENDHT_LIBS) \
+	$(LIBARCHIVE) \
 	$(LIBUPNP_LIBS) \
 	$(LIBGIT2_LIBS) \
 	$(LIBAVCODEC_LIBS) \
@@ -42,17 +51,8 @@ libjami_la_LIBADD += \
 	$(FMT_LIBS) \
 	$(LIBSSL_LIBS) \
 	$(LIBCRYPTO_LIBS) \
-	$(ARCHIVE_LIBS) \
 	$(ZLIB_LIBS)
 
-if ENABLE_PLUGIN
-if HAVE_OSX
-libjami_la_LIBADD += $(MINIZIP_LIBS)
-else
-libjami_la_LIBADD += $(ARCHIVE_LIBS)
-endif
-endif
-
 # XXX: It seems this should be the default value when otherwise left
 # unspecified, but for some reason this is required otherwise the
 # shared object fails to link against ffmpeg's libswscale.a.
-- 
GitLab