From 26ff9f6e5940fd0489c1452e3f1113f45c3b7962 Mon Sep 17 00:00:00 2001
From: Chen Zhiwei <zhiwchen@cn.ibm.com>
Date: Thu, 24 Sep 2015 10:05:23 +0800
Subject: [PATCH] Fix picojson header file issue

Use the built-in picojson git submodule instead of system-wide picojson
---
 .gitmodules       | 3 +++
 3rdparty/picojson | 1 +
 README.md         | 1 -
 configure.ac      | 7 +++----
 4 files changed, 7 insertions(+), 5 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 3rdparty/picojson

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..fd35e73
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "3rdparty/picojson"]
+	path = 3rdparty/picojson
+	url = https://github.com/kazuho/picojson
diff --git a/3rdparty/picojson b/3rdparty/picojson
new file mode 160000
index 0000000..25fc213
--- /dev/null
+++ b/3rdparty/picojson
@@ -0,0 +1 @@
+Subproject commit 25fc213cca61ea22b3c2e4db8def9927562ba5f7
diff --git a/README.md b/README.md
index cb674d8..2b92511 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,6 @@ Building Mesos modules requires system-wide installation of the following:
 1. google-protobuf
 2. glog
 3. boost
-4. picojson
 
 ## Build Mesos with some unbundled dependencies
 
diff --git a/configure.ac b/configure.ac
index eb4600a..73405ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,6 +64,9 @@ else
   fi
 fi
 
+basedir=$(cd $(dirname $0) && pwd)
+MESOS_CPPFLAGS="${MESOS_CPPFLAGS} -I${basedir}/3rdparty/picojson"
+
 AC_SUBST(MESOS_CPPFLAGS)
 AC_SUBST(MESOS_LDFLAGS)
 
@@ -159,10 +162,6 @@ AC_CHECK_HEADER([google/protobuf/message.h],
                     [AC_MSG_ERROR([google protobuf is not installed.])])],
                 [AC_MSG_ERROR([google protobuf is not installed.])])
 
-AC_CHECK_HEADER([picojson.h],
-                [],
-                [AC_MSG_ERROR([picojson is not installed.])])
-
 AC_CHECK_HEADERS([boost/lexical_cast.hpp boost/functional/hash.hpp],
                 [],
                 [AC_MSG_ERROR([boost is not installed.])])