Skip to content

Commit 26ff9f6

Browse files
committed
Fix picojson header file issue
Use the built-in picojson git submodule instead of system-wide picojson
1 parent 1a31e22 commit 26ff9f6

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "3rdparty/picojson"]
2+
path = 3rdparty/picojson
3+
url = https://github.com/kazuho/picojson

3rdparty/picojson

Submodule picojson added at 25fc213

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Building Mesos modules requires system-wide installation of the following:
2222
1. google-protobuf
2323
2. glog
2424
3. boost
25-
4. picojson
2625

2726
## Build Mesos with some unbundled dependencies
2827

configure.ac

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ else
6464
fi
6565
fi
6666

67+
basedir=$(cd $(dirname $0) && pwd)
68+
MESOS_CPPFLAGS="${MESOS_CPPFLAGS} -I${basedir}/3rdparty/picojson"
69+
6770
AC_SUBST(MESOS_CPPFLAGS)
6871
AC_SUBST(MESOS_LDFLAGS)
6972

@@ -159,10 +162,6 @@ AC_CHECK_HEADER([google/protobuf/message.h],
159162
[AC_MSG_ERROR([google protobuf is not installed.])])],
160163
[AC_MSG_ERROR([google protobuf is not installed.])])
161164

162-
AC_CHECK_HEADER([picojson.h],
163-
[],
164-
[AC_MSG_ERROR([picojson is not installed.])])
165-
166165
AC_CHECK_HEADERS([boost/lexical_cast.hpp boost/functional/hash.hpp],
167166
[],
168167
[AC_MSG_ERROR([boost is not installed.])])

0 commit comments

Comments
 (0)