From 1531775be7d120d4d04fa433bf7250168608bf3b Mon Sep 17 00:00:00 2001
From: Nicky <sl.nicky.ml@googlemail.com>
Date: Fri, 6 Apr 2018 12:37:21 +0200
Subject: [PATCH] If building standlone do not blindly add ../json to the
 include search path. IMO that's horrible as generic includes like
 value.h/write.h/config.h/features.h should not be reachable with just
 #include <config.h>. This will easily clash with system includes. IMO normal
 builds should use #include "json/<header.h>" too.

---
 indra/llcommon/llsdjson.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/indra/llcommon/llsdjson.h b/indra/llcommon/llsdjson.h
index 2be7112404..000369d39f 100644
--- a/indra/llcommon/llsdjson.h
+++ b/indra/llcommon/llsdjson.h
@@ -34,7 +34,12 @@
 #include "stdtypes.h"
 
 #include "llsd.h"
+
+#ifndef LL_USESYSTEMLIBS
 #include "value.h"
+#else
+#include "json/value.h"
+#endif
 
 /// Convert a parsed JSON structure into LLSD maintaining member names and 
 /// array indexes.