Fix picojson header file issue

Use the built-in picojson git submodule instead of system-wide picojson
mesos · Sep 25, 2015 · 26ff9f6 · 26ff9f6
1 parent 1a31e22
commit 26ff9f6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
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
diff --git 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
@@ -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.])])
-Original file line number
+Diff line change
@@ Expand Up @@
 . google-protobuf
 . glog
 . boost
-. picojson
     ## Build Mesos with some unbundled dependencies
@@ Expand Down @@