Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
mediastreamer2
Commits
5a78118c
Commit
5a78118c
authored
Jan 07, 2015
by
Ghislain MARY
Browse files
Really activate zrtp if ENABLE_ZRTP is activated when building with CMake.
parent
3623a4fe
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
3 deletions
+8
-3
CMakeLists.txt
CMakeLists.txt
+3
-0
configure.ac
configure.ac
+1
-1
mediastreamer-config.h.cmake
mediastreamer-config.h.cmake
+3
-1
src/voip/zrtp.c
src/voip/zrtp.c
+1
-1
No files found.
CMakeLists.txt
View file @
5a78118c
...
...
@@ -316,6 +316,9 @@ endif()
if
(
SRTP_FOUND
)
set
(
HAVE_SRTP 1
)
endif
()
if
(
BZRTP_FOUND
)
set
(
HAVE_ZRTP 1
)
endif
()
if
(
ENABLE_ALSA
)
set
(
__ALSA_ENABLED__ 1
)
endif
()
...
...
configure.ac
View file @
5a78118c
...
...
@@ -1081,7 +1081,7 @@ if test "$zrtp" = "true" ; then
if test "$have_srtp" = "no" ; then
AC_MSG_ERROR("ZRTP requires SRTP")
fi
AC_DEFINE(HAVE_
zrtp
, 1, [Defined when zrtp support is compiled])
AC_DEFINE(HAVE_
ZRTP
, 1, [Defined when zrtp support is compiled])
LIBS="$LIBS $LIBBZRTP_LIBS"
CFLAGS="$CFLAGS $LIBBZRTP_CFLAGS"
else
...
...
mediastreamer-config.h.cmake
View file @
5a78118c
...
...
@@ -49,6 +49,9 @@
#cmakedefine WORDS_BIGENDIAN
#cmakedefine MS_FIXED_POINT
#cmakedefine HAVE_SRTP
#cmakedefine HAVE_ZRTP
#cmakedefine __ALSA_ENABLED__
#cmakedefine __ARTS_ENABLED__
#cmakedefine __MACSND_ENABLED__
...
...
@@ -56,7 +59,6 @@
#cmakedefine __PORTAUDIO_ENABLED__
#cmakedefine __PULSEAUDIO_ENABLED__
#cmakedefine __QSA_ENABLED__
#cmakedefine HAVE_SRTP
#cmakedefine HAVE_SPEEXDSP
#cmakedefine PACKAGE_PLUGINS_DIR "${PACKAGE_PLUGINS_DIR}"
#cmakedefine PACKAGE_DATA_DIR "${PACKAGE_DATA_DIR}"
...
...
src/voip/zrtp.c
View file @
5a78118c
...
...
@@ -24,7 +24,7 @@
#include <malloc.h>
#endif
#ifdef HAVE_
zrtp
#ifdef HAVE_
ZRTP
#undef PACKAGE_NAME
#undef PACKAGE_STRING
#undef PACKAGE_TARNAME
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment