Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
0972070b
Commit
0972070b
authored
2 years ago
by
Sébastien Blin
Committed by
Adrien Béraud
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
build: link archive before ssl
Change-Id: Ie1e33d9638f2ab616764c8c29e877bdbf3b7f1ea
parent
4d0ab27d
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/Makefile.am
+9
-9
9 additions, 9 deletions
src/Makefile.am
with
9 additions
and
9 deletions
src/Makefile.am
+
9
−
9
View file @
0972070b
...
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment