From ac40d13aa641b519001812513b8e449ca5185cac Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Wed, 10 Sep 2014 16:13:13 -0400
Subject: [PATCH] Revert "configure: add check for ucommon and fix test link"
This reverts commit 1fcb698d463b7a730f27ebd632f66ab2344885ae.
Change-Id: I075cd241ca91a7d695752562f90489722f349e5f
---
daemon/configure.ac | 2 --
daemon/test/Makefile.am | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/daemon/configure.ac b/daemon/configure.ac
index d4d65ebe28..23c5d74e60 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -294,8 +294,6 @@ 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([UCOMMON], [ucommon],, [AC_MSG_ERROR(Missing ucommon libraries)])
-
dnl Presence is a default-enabled feature
AC_ARG_ENABLE([presence],
AS_HELP_STRING([--disable-presence], [Disable SIP presence support]))
diff --git a/daemon/test/Makefile.am b/daemon/test/Makefile.am
index 09b8fd7fc2..be8561a31f 100644
--- a/daemon/test/Makefile.am
+++ b/daemon/test/Makefile.am
@@ -6,7 +6,7 @@ check_PROGRAMS = test
TESTS = run_tests.sh
test_CXXFLAGS = -DWORKSPACE="$(top_srcdir)/test/" @PTHREAD_CFLAGS@
-test_LDADD = $(top_builddir)/src/libsflphone.la $(top_builddir)/src/libsflphone_la-logger.lo @CPPUNIT_LIBS@ @YAMLCPP_LIBS@ @UCOMMON_LIBS@
+test_LDADD = $(top_builddir)/src/libsflphone.la $(top_builddir)/src/libsflphone_la-logger.lo @CPPUNIT_LIBS@ @YAMLCPP_LIBS@
if BUILD_INSTANT_MESSAGING
test_LDADD += @EXPAT_LIBS@
--
GitLab