Build with jansson 2.14 instead of 2.10
This commit is contained in:
parent
b242242770
commit
b9588627cd
@ -69,8 +69,8 @@ if test x$sse4 = xsse4_1; then
|
||||
AC_DEFINE([USE_SSE4], [1], [Use sse4 assembly instructions for sha256])
|
||||
fi
|
||||
|
||||
AC_CONFIG_SUBDIRS([src/jansson-2.10])
|
||||
JANSSON_LIBS="jansson-2.10/src/.libs/libjansson.a"
|
||||
AC_CONFIG_SUBDIRS([src/jansson-2.14])
|
||||
JANSSON_LIBS="jansson-2.14/src/.libs/libjansson.a"
|
||||
|
||||
AC_SUBST(JANSSON_LIBS)
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
SUBDIRS = jansson-2.10
|
||||
SUBDIRS = jansson-2.14
|
||||
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/src/jansson-2.10/src
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/src/jansson-2.14/src
|
||||
|
||||
native_objs :=
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
EXTRA_DIST = CHANGES LICENSE README.rst CMakeLists.txt cmake android examples scripts
|
||||
SUBDIRS = doc src test
|
||||
SUBDIRS = doc src
|
||||
|
||||
# "make distcheck" builds the dvi target, so use it to check that the
|
||||
# documentation is built correctly.
|
||||
|
||||
@ -172,10 +172,5 @@ AC_CONFIG_FILES([
|
||||
doc/Makefile
|
||||
src/Makefile
|
||||
src/jansson_config.h
|
||||
test/Makefile
|
||||
test/bin/Makefile
|
||||
test/ossfuzz/Makefile
|
||||
test/suites/Makefile
|
||||
test/suites/api/Makefile
|
||||
])
|
||||
AC_OUTPUT
|
||||
|
||||
Loading…
Reference in New Issue
Block a user