Skip to content
Snippets Groups Projects
Commit 7b4fb4ec authored by Tristan Matthews's avatar Tristan Matthews
Browse files

daemon: drop commoncpp/ucommon dependency

Refs #51688

Change-Id: I15ef18300075ffcaf9dedb744a516c29d766540c
parent 4ff3c0b4
Branches
No related tags found
No related merge requests found
...@@ -80,10 +80,6 @@ AC_SEARCH_LIBS([yaml_parser_initialize], [yaml], [AC_SUBST(YAML_LIBS, -lyaml)], ...@@ -80,10 +80,6 @@ AC_SEARCH_LIBS([yaml_parser_initialize], [yaml], [AC_SUBST(YAML_LIBS, -lyaml)],
LIBCRYPTO_MIN_VERSION=1.0 LIBCRYPTO_MIN_VERSION=1.0
PKG_CHECK_MODULES(LIBCRYPTO, libcrypto >= ${LIBCRYPTO_MIN_VERSION}, HAVE_LIBCRYPTO=true, HAVE_LIBCRYPTO=false); PKG_CHECK_MODULES(LIBCRYPTO, libcrypto >= ${LIBCRYPTO_MIN_VERSION}, HAVE_LIBCRYPTO=true, HAVE_LIBCRYPTO=false);
AS_IF([test "x$CLANG" = "xyes"], [
PKG_CHECK_MODULES(UCOMMON, ucommon >= 6.0.0,, AC_MSG_ERROR([ucommon is found but is too old to support clang]))
]);
dnl Check for alsa development package - name: libasound2-dev dnl Check for alsa development package - name: libasound2-dev
ALSA_MIN_VERSION=1.0 ALSA_MIN_VERSION=1.0
AC_ARG_WITH([alsa], AC_ARG_WITH([alsa],
...@@ -166,11 +162,6 @@ AS_IF([test "x$enable_video" != "xno"], ...@@ -166,11 +162,6 @@ AS_IF([test "x$enable_video" != "xno"],
[AM_CONDITIONAL(SFL_VIDEO, false)]); [AM_CONDITIONAL(SFL_VIDEO, false)]);
LIBCCGNU2_MIN_VERSION=1.3.1
PKG_CHECK_MODULES([CCGNU2], [commoncpp] >= ${LIBCCGNU2_MIN_VERSION},,
[PKG_CHECK_MODULES([CCGNU2], [libccgnu2] >= ${LIBCCGNU2_MIN_VERSION},,
AC_MSG_ERROR([Missing commoncpp development files]))])
LIBCCRTP_MIN_VERSION=1.3.0 LIBCCRTP_MIN_VERSION=1.3.0
PKG_CHECK_MODULES([CCRTP], [libccrtp] >= ${LIBCCRTP_MIN_VERSION},, [ PKG_CHECK_MODULES([CCRTP], [libccrtp] >= ${LIBCCRTP_MIN_VERSION},, [
PKG_CHECK_MODULES([CCRTP], [libccrtp1] >= ${LIBCCRTP_MIN_VERSION},, AC_MSG_ERROR([Missing ccrtp development files])) PKG_CHECK_MODULES([CCRTP], [libccrtp1] >= ${LIBCCRTP_MIN_VERSION},, AC_MSG_ERROR([Missing ccrtp development files]))
......
...@@ -53,8 +53,6 @@ libsflphone_la_LIBADD = \ ...@@ -53,8 +53,6 @@ libsflphone_la_LIBADD = \
./history/libhistory.la $(SFL_VIDEO_LIBS) $(IM_LIB) ./history/libhistory.la $(SFL_VIDEO_LIBS) $(IM_LIB)
libsflphone_la_LDFLAGS = \ libsflphone_la_LDFLAGS = \
@CCGNU2_LIBS@ \
@CCEXT2_LIBS@ \
@ZRTPCPP_LIBS@ \ @ZRTPCPP_LIBS@ \
$(PJSIP_LIBS) \ $(PJSIP_LIBS) \
@CCRTP_LIBS@ \ @CCRTP_LIBS@ \
...@@ -66,7 +64,6 @@ libsflphone_la_LDFLAGS = \ ...@@ -66,7 +64,6 @@ libsflphone_la_LDFLAGS = \
@DBUSCPP_LIBS@ @DBUSCPP_LIBS@
libsflphone_la_CFLAGS = \ libsflphone_la_CFLAGS = \
@CCGNU2_CFLAGS@ \
@ZRTPCPP_CFLAGS@ \ @ZRTPCPP_CFLAGS@ \
$(PJSIP_CFLAGS) \ $(PJSIP_CFLAGS) \
@CCRTP_CFLAGS@ \ @CCRTP_CFLAGS@ \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment