Skip to content

Commit 90727e9

Browse files
committed
Fix picojson header file issue
Use the built-in picojson git submodule instead of system-wide picojson
1 parent 4112393 commit 90727e9

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
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 cc130fb

configure.ac

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ else
6060
fi
6161
fi
6262

63+
basedir=$(cd $(dirname $0) && pwd)
64+
MESOS_CPPFLAGS="${MESOS_CPPFLAGS} -I${basedir}/3rdparty/picojson"
65+
6366
AC_SUBST(MESOS_CPPFLAGS)
6467
AC_SUBST(MESOS_LDFLAGS)
6568

@@ -155,10 +158,6 @@ AC_CHECK_HEADER([google/protobuf/message.h],
155158
[AC_MSG_ERROR([google protobuf is not installed.])])],
156159
[AC_MSG_ERROR([google protobuf is not installed.])])
157160

158-
AC_CHECK_HEADER([picojson.h],
159-
[],
160-
[AC_MSG_ERROR([picojson is not installed.])])
161-
162161
AC_CHECK_HEADERS([boost/lexical_cast.hpp boost/functional/hash.hpp],
163162
[],
164163
[AC_MSG_ERROR([boost is not installed.])])

0 commit comments

Comments
 (0)