Fix picojson header file issue

chenzhiwei · chenzhiwei · commit 90727e953e0c · 2015-09-24T10:08:34.000+08:00
Use the built-in picojson git submodule instead of system-wide picojson
diff --git a/.gitmodules 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
@@ -0,0 +1 @@
+Subproject commit cc130fbcb165ffbc2aa7a7fadfe98ff6ed4120c8
diff --git a/configure.ac b/configure.ac
@@ -60,6 +60,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)
 
@@ -155,10 +158,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.])])

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[submodule "3rdparty/picojson"]`
	`2`	`+ path = 3rdparty/picojson`
	`3`	`+ url = https://github.com/kazuho/picojson`