Commit 72c3cfe6 authored by Tristan Matthews's avatar Tristan Matthews Committed by Tristan Matthews

* #9381: YAML_LIBS must be explicitly set in AC_SEARCH_LIBS macro

parent ea984db8
......@@ -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
......
......@@ -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 = \
......
......@@ -14,4 +14,3 @@ noinst_HEADERS = \
yamlnode.h
libconfig_la_CXXFLAGS = -I $(top_srcdir)/src
libconfig_la_LDFLAGS = @YAML_LIBS@
......@@ -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 = \
......
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