Skip to content
Snippets Groups Projects
Commit 0972070b authored by Sébastien Blin's avatar Sébastien Blin Committed by Adrien Béraud
Browse files

build: link archive before ssl

Change-Id: Ie1e33d9638f2ab616764c8c29e877bdbf3b7f1ea
parent 4d0ab27d
No related branches found
No related tags found
No related merge requests found
......@@ -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.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment