From ec25e90377d2ff0e8f023696d5d251960fcb4d92 Mon Sep 17 00:00:00 2001 From: Tristan Matthews <tristan.matthews@savoirfairelinux.com> Date: Thu, 17 Jul 2014 17:17:37 -0400 Subject: [PATCH] daemon: drop commoncpp/ucommon dependency Refs #51688 Change-Id: I15ef18300075ffcaf9dedb744a516c29d766540c --- daemon/configure.ac | 9 --------- daemon/src/Makefile.am | 3 --- 2 files changed, 12 deletions(-) diff --git a/daemon/configure.ac b/daemon/configure.ac index 3e41e4e8b7..6ec0fb5486 100644 --- a/daemon/configure.ac +++ b/daemon/configure.ac @@ -80,10 +80,6 @@ AC_SEARCH_LIBS([yaml_parser_initialize], [yaml], [AC_SUBST(YAML_LIBS, -lyaml)], LIBCRYPTO_MIN_VERSION=1.0 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 ALSA_MIN_VERSION=1.0 AC_ARG_WITH([alsa], @@ -166,11 +162,6 @@ AS_IF([test "x$enable_video" != "xno"], [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 PKG_CHECK_MODULES([CCRTP], [libccrtp] >= ${LIBCCRTP_MIN_VERSION},, [ PKG_CHECK_MODULES([CCRTP], [libccrtp1] >= ${LIBCCRTP_MIN_VERSION},, AC_MSG_ERROR([Missing ccrtp development files])) diff --git a/daemon/src/Makefile.am b/daemon/src/Makefile.am index ba43cf1f04..ca01b67cd6 100644 --- a/daemon/src/Makefile.am +++ b/daemon/src/Makefile.am @@ -53,8 +53,6 @@ libsflphone_la_LIBADD = \ ./history/libhistory.la $(SFL_VIDEO_LIBS) $(IM_LIB) libsflphone_la_LDFLAGS = \ - @CCGNU2_LIBS@ \ - @CCEXT2_LIBS@ \ @ZRTPCPP_LIBS@ \ $(PJSIP_LIBS) \ @CCRTP_LIBS@ \ @@ -66,7 +64,6 @@ libsflphone_la_LDFLAGS = \ @DBUSCPP_LIBS@ libsflphone_la_CFLAGS = \ - @CCGNU2_CFLAGS@ \ @ZRTPCPP_CFLAGS@ \ $(PJSIP_CFLAGS) \ @CCRTP_CFLAGS@ \ -- GitLab