From cd5a216a37b40f10aaefc640a554d3fd929f91cb Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Tue, 20 Mar 2012 14:46:58 -0400
Subject: [PATCH] * #9381: use PKG_CHECK_MODULES to test for yaml

---
 daemon/configure.ac           | 7 +++----
 daemon/src/config/Makefile.am | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/daemon/configure.ac b/daemon/configure.ac
index 5196ba421b..4671b048f7 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -122,6 +122,9 @@ 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);
 
+YAML_MIN_VERSION=0.1.0
+PKG_CHECK_MODULES(YAML, yaml-0.1 >= ${YAML_MIN_VERSION}, ,AC_MSG_ERROR([Missing yaml development files]));
+
 LIBCRYPTO_MIN_VERSION=1.0
 PKG_CHECK_MODULES(LIBCRYPTO, libcrypto >= ${LIBCRYPTO_MIN_VERSION}, HAVE_LIBCRYPTO=true, HAVE_LIBCRYPTO=false);
 
@@ -164,10 +167,6 @@ CXXFLAGS="${CXXFLAGS} -g -Wno-return-type -Wall -Wextra -Wnon-virtual-dtor -Weff
 
 AX_LIB_EXPAT
 
-AC_SEARCH_LIBS([yaml_parser_initialize], [yaml], [], [
-    AC_MSG_ERROR([Unable to find yaml development files])
-])
-
 AX_PTHREAD
 
 AX_PATH_LIB_PCRE
diff --git a/daemon/src/config/Makefile.am b/daemon/src/config/Makefile.am
index 559faf36eb..c267988ab4 100644
--- a/daemon/src/config/Makefile.am
+++ b/daemon/src/config/Makefile.am
@@ -14,3 +14,4 @@ noinst_HEADERS = \
 	yamlnode.h
 
 libconfig_la_CXXFLAGS = -I $(top_srcdir)/src
+libconfig_la_LDFLAGS = @YAML_LIBS@
-- 
GitLab