Commit d22fa079 authored by Alexandre Savard's avatar Alexandre Savard

[#1722] Link to libpcre

parent b0fcdcbf
......@@ -214,12 +214,6 @@ AC_SUBST(libssl_LIBS)
AC_SUBST(ZRTPCPP_LIBS)
AC_SUBST(ZRTPCPP_CFLAGS)
dnl Check for libpcre
# LIBPCRE_MIN_VERSION=0.0.0
# PKG_CHECK_MODULES(PCRE, libpcre >= ${LIBPCRE_MIN_VERSION})
# AC_SUBST(PCRE_LIBS)
#AC_SUBST(PCRE_CFLAGS)
dnl DBus-C++ detection (used to be in library own build system)
DBUS_REQUIRED_VERSION=0.60
......@@ -290,7 +284,7 @@ fi
xml_CFLAGS=
xml_LIBS=-lexpat
AC_SUBST(xml_CFLAGS)
AC_SUBST(xml_CFLAGS)
AC_SUBST(xml_LIBS)
AC_CHECK_LIB([pthread], pthread_create,
......@@ -301,6 +295,7 @@ AC_CHECK_LIB([pthread], pthread_create,
AC_MSG_ERROR([You need the POSIX Thread library (pthreads)])
fi
AC_CHECK_LIB([pcre], pcre_free,
[AC_CHECK_HEADERS(pcre.h, have_pcre=true, have_pcre=false)],
have_pcre=false)
......@@ -309,6 +304,12 @@ AC_CHECK_LIB([pcre], pcre_free,
AC_MSG_ERROR([You need the Perl-Compatible Regular Expressions library (pcre)])
fi
PCRE_LIBS=-lpcre
PCRE_CFLAGS=
AC_SUBST(PCRE_LIBS)
AC_SUBST(PCRE_CFLAGS)
# For the tools/, we need libdbus-c++ for the "build" architecture as well
......
......@@ -19,4 +19,7 @@ noinst_HEADERS = \
sdpmedia.h \
sipaccount.h \
sipcall.h \
sipvoiplink.h
\ No newline at end of file
sipvoiplink.h
libsiplink_la_CXXFLAGS = \
@PCRE_LIBS@
\ No newline at end of file
......@@ -3224,7 +3224,13 @@ void call_on_media_update (pjsip_inv_session *inv, pj_status_t status)
remoteOffer.push_back(attr);
// sfl::SdesNegotiator sdesnego(sfl::CryptoSuites, remoteOffer);
std::vector<sfl::CryptoSuiteDefinition>localCapabilities;
for(int i = 0; i < 3; i++) {
localCapabilities.push_back(sfl::CryptoSuites[i]);
}
sfl::SdesNegotiator sdesnego(localCapabilities, remoteOffer);
try {
call->setAudioStart (true);
......
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