From 155b035cd8ae2d33ad201e747366c7670a9d8833 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Wed, 17 Jan 2018 17:07:36 +0100
Subject: [PATCH] Forgot to surround surround yaml include with defines

---
 src/Makefile.in | 2 +-
 src/convert.c   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Makefile.in b/src/Makefile.in
index b37d296e..227d683f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -323,7 +323,7 @@ convert.lo convert.o: $(srcdir)/convert.c \
  $(srcdir)/util/orig-headers/locks.h $(srcdir)/util/auxiliary/util/log.h $(srcdir)/debug.h $(srcdir)/rr-iter.h \
  $(srcdir)/rr-dict.h $(srcdir)/gldns/gbuffer.h $(srcdir)/gldns/pkthdr.h $(srcdir)/anchor.h $(srcdir)/gldns/wire2str.h \
  $(srcdir)/gldns/str2wire.h $(srcdir)/gldns/rrdef.h $(srcdir)/gldns/parseutil.h $(srcdir)/const-info.h $(srcdir)/dict.h \
- $(srcdir)/list.h $(srcdir)/jsmn/jsmn.h $(stubbysrcdir)/src/yaml/convert_yaml_to_json.h $(srcdir)/convert.h
+ $(srcdir)/list.h $(srcdir)/jsmn/jsmn.h $(srcdir)/convert.h
 dict.lo dict.o: $(srcdir)/dict.c \
  config.h \
  $(srcdir)/types-internal.h \
diff --git a/src/convert.c b/src/convert.c
index 03a27af2..82adf241 100644
--- a/src/convert.c
+++ b/src/convert.c
@@ -56,7 +56,9 @@
 #include "dict.h"
 #include "list.h"
 #include "jsmn/jsmn.h"
+#ifdef USE_YAML_CONFIG
 #include "yaml/convert_yaml_to_json.h"
+#endif
 #include "convert.h"
 #include "debug.h"