From 72c3cfe6c6b039644cec7f6d7025d2a70c4c0327 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Wed, 21 Mar 2012 07:33:15 -0400
Subject: [PATCH] * #9381: YAML_LIBS must be explicitly set in AC_SEARCH_LIBS
macro
---
daemon/configure.ac | 2 +-
daemon/src/Makefile.am | 2 +-
daemon/src/config/Makefile.am | 1 -
daemon/test/Makefile.am | 2 +-
4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/daemon/configure.ac b/daemon/configure.ac
index e1a452a4b6..6fdc2ce37c 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -100,7 +100,7 @@ dnl Check for uuid development package - name: uuid-dev
UUID_MIN_VERSION=1.0
PKG_CHECK_MODULES(UUID, uuid >= ${UUID_MIN_VERSION}, HAVE_UUID=true, HAVE_UUID=false);
-AC_SEARCH_LIBS([yaml_parser_initialize], [yaml], [], [
+AC_SEARCH_LIBS([yaml_parser_initialize], [yaml], [AC_SUBST(YAML_LIBS, -lyaml)], [
AC_MSG_ERROR([Unable to find yaml development files])])
LIBCRYPTO_MIN_VERSION=1.0
diff --git a/daemon/src/Makefile.am b/daemon/src/Makefile.am
index e6e8986a0f..158628f70c 100644
--- a/daemon/src/Makefile.am
+++ b/daemon/src/Makefile.am
@@ -30,7 +30,7 @@ sflphoned_CXXFLAGS = \
# libsflphone
-sflphoned_LDADD = ./libsflphone.la $(libssl_LIBS) -lcrypto
+sflphoned_LDADD = ./libsflphone.la $(libssl_LIBS) -lcrypto $(YAML_LIBS)
noinst_LTLIBRARIES = libsflphone.la
noinst_HEADERS = \
diff --git a/daemon/src/config/Makefile.am b/daemon/src/config/Makefile.am
index c267988ab4..559faf36eb 100644
--- a/daemon/src/config/Makefile.am
+++ b/daemon/src/config/Makefile.am
@@ -14,4 +14,3 @@ noinst_HEADERS = \
yamlnode.h
libconfig_la_CXXFLAGS = -I $(top_srcdir)/src
-libconfig_la_LDFLAGS = @YAML_LIBS@
diff --git a/daemon/test/Makefile.am b/daemon/test/Makefile.am
index 28c269d257..111e599a8b 100644
--- a/daemon/test/Makefile.am
+++ b/daemon/test/Makefile.am
@@ -6,7 +6,7 @@ check_PROGRAMS = test
TESTS = run_tests.sh
test_CXXFLAGS = -I .
-test_LDADD = $(top_builddir)/src/libsflphone.la @ZRTPCPP_LIBS@ @LIBCRYPTO_LIBS@ @CPPUNIT_LIBS@
+test_LDADD = $(top_builddir)/src/libsflphone.la @ZRTPCPP_LIBS@ @LIBCRYPTO_LIBS@ @CPPUNIT_LIBS@ @YAML_LIBS@
EXTRA_DIST = $(test_SOURCES) sflphoned-sample.yml history-sample.tpl run_tests.sh
test_SOURCES = \
--
GitLab