Commit 5a78118c authored by Ghislain MARY's avatar Ghislain MARY

Really activate zrtp if ENABLE_ZRTP is activated when building with CMake.

parent 3623a4fe
...@@ -316,6 +316,9 @@ endif() ...@@ -316,6 +316,9 @@ endif()
if(SRTP_FOUND) if(SRTP_FOUND)
set(HAVE_SRTP 1) set(HAVE_SRTP 1)
endif() endif()
if(BZRTP_FOUND)
set(HAVE_ZRTP 1)
endif()
if(ENABLE_ALSA) if(ENABLE_ALSA)
set(__ALSA_ENABLED__ 1) set(__ALSA_ENABLED__ 1)
endif() endif()
......
...@@ -1081,7 +1081,7 @@ if test "$zrtp" = "true" ; then ...@@ -1081,7 +1081,7 @@ if test "$zrtp" = "true" ; then
if test "$have_srtp" = "no" ; then if test "$have_srtp" = "no" ; then
AC_MSG_ERROR("ZRTP requires SRTP") AC_MSG_ERROR("ZRTP requires SRTP")
fi 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" LIBS="$LIBS $LIBBZRTP_LIBS"
CFLAGS="$CFLAGS $LIBBZRTP_CFLAGS" CFLAGS="$CFLAGS $LIBBZRTP_CFLAGS"
else else
......
...@@ -49,6 +49,9 @@ ...@@ -49,6 +49,9 @@
#cmakedefine WORDS_BIGENDIAN #cmakedefine WORDS_BIGENDIAN
#cmakedefine MS_FIXED_POINT #cmakedefine MS_FIXED_POINT
#cmakedefine HAVE_SRTP
#cmakedefine HAVE_ZRTP
#cmakedefine __ALSA_ENABLED__ #cmakedefine __ALSA_ENABLED__
#cmakedefine __ARTS_ENABLED__ #cmakedefine __ARTS_ENABLED__
#cmakedefine __MACSND_ENABLED__ #cmakedefine __MACSND_ENABLED__
...@@ -56,7 +59,6 @@ ...@@ -56,7 +59,6 @@
#cmakedefine __PORTAUDIO_ENABLED__ #cmakedefine __PORTAUDIO_ENABLED__
#cmakedefine __PULSEAUDIO_ENABLED__ #cmakedefine __PULSEAUDIO_ENABLED__
#cmakedefine __QSA_ENABLED__ #cmakedefine __QSA_ENABLED__
#cmakedefine HAVE_SRTP
#cmakedefine HAVE_SPEEXDSP #cmakedefine HAVE_SPEEXDSP
#cmakedefine PACKAGE_PLUGINS_DIR "${PACKAGE_PLUGINS_DIR}" #cmakedefine PACKAGE_PLUGINS_DIR "${PACKAGE_PLUGINS_DIR}"
#cmakedefine PACKAGE_DATA_DIR "${PACKAGE_DATA_DIR}" #cmakedefine PACKAGE_DATA_DIR "${PACKAGE_DATA_DIR}"
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <malloc.h> #include <malloc.h>
#endif #endif
#ifdef HAVE_zrtp #ifdef HAVE_ZRTP
#undef PACKAGE_NAME #undef PACKAGE_NAME
#undef PACKAGE_STRING #undef PACKAGE_STRING
#undef PACKAGE_TARNAME #undef PACKAGE_TARNAME
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment