aboutsummaryrefslogtreecommitdiffstats
path: root/Config.mk
diff options
context:
space:
mode:
authorRoger Pau Monne <roger.pau@entel.upc.edu>2012-01-31 16:48:06 +0000
committerRoger Pau Monne <roger.pau@entel.upc.edu>2012-01-31 16:48:06 +0000
commitee65792d9386e7eb538dd09674c1c275f2691abb (patch)
tree290984b181271a662155c02478b9f0ff9281f6d5 /Config.mk
parent1a4af67d32b1c39b73e09346203f3e12c00b9e41 (diff)
downloadxen-ee65792d9386e7eb538dd09674c1c275f2691abb.tar.gz
xen-ee65792d9386e7eb538dd09674c1c275f2691abb.tar.bz2
xen-ee65792d9386e7eb538dd09674c1c275f2691abb.zip
libxl: add support for yajl 2.x
This patch adds support for yajl versions 2.x, while retaining 1.x compatibility. All the needed ifdefs can be found in libxl_json.h. Signed-off-by: Roger Pau Monne <roger.pau@entel.upc.edu> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'Config.mk')
-rw-r--r--Config.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/Config.mk b/Config.mk
index 90a77286a1..c666646003 100644
--- a/Config.mk
+++ b/Config.mk
@@ -186,6 +186,11 @@ CONFIG_LIBICONV := $(shell export OS="`uname -s`"; \
. $(XEN_ROOT)/tools/check/funcs.sh; \
has_lib libiconv.so && echo 'y' || echo 'n')
+CONFIG_YAJL_VERSION := $(shell export OS="`uname -s`"; \
+ export CHECK_INCLUDES="$(CHECK_INCLUDES)"; \
+ . $(XEN_ROOT)/tools/check/funcs.sh; \
+ has_header yajl/yajl_version.h && echo 'y' || echo 'n')
+
# Enable XSM security module (by default, Flask).
XSM_ENABLE ?= n
FLASK_ENABLE ?= $(XSM_ENABLE)