Skip to content

Fix picojson header file issue #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix picojson header file issue #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "3rdparty/picojson"]
path = 3rdparty/picojson
url = https://github.com/kazuho/picojson
1 change: 1 addition & 0 deletions 3rdparty/picojson
Open in desktop
Submodule picojson added at 25fc21
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
7 changes: 3 additions & 4 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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.])])
Expand Down