Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
medialibrary
Commits
a69f1e19
Commit
a69f1e19
authored
Aug 10, 2016
by
Hugo Beauzée-Luyssen
Browse files
Check for RapidJSON
parent
51c36973
Changes
2
Hide whitespace changes
Inline
Side-by-side
Makefile.am
View file @
a69f1e19
...
...
@@ -301,6 +301,7 @@ samples_CPPFLAGS = \
-DSRC_DIR
=
\"
$(top_srcdir)
\"
\
-I
$(top_srcdir)
/test
\
-I
$(top_srcdir)
/googletest/include
\
$(RAPIDJSON_CFLAGS)
\
$(NULL)
samples_LDADD
=
\
...
...
configure.ac
View file @
a69f1e19
...
...
@@ -292,6 +292,15 @@ AC_ARG_ENABLE(tests,AC_HELP_STRING([--disable-tests], [Disable build of automate
AM_CONDITIONAL([HAVE_TESTS], [test "${enable_tests}" = "yes"])
AS_IF([test "${enable_tests}" = "yes"], [
AX_PTHREAD([have_pthread=yes],[have_pthread=no])
PKG_CHECK_MODULES(RAPIDJSON, RapidJSON, [], [
# We need the .pc for cross compilation, but we don't consider it a failure
# when building natively, mostly because debian doesn't package the .pc
if test "$host" != "$build" ; then
AC_MSG_ERROR(["Failed to find rapidjson"])
else
AC_MSG_WARN("Failed to find rapidjson using pkg-config. Using default location")
fi
])
])
AM_CONDITIONAL([HAVE_PTHREAD], [test "${have_pthread}" = "yes"])
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment