comparison configure.ac @ 1695:3c5a87970daa

Update for capnp 0.6
author Chris Cannam
date Tue, 09 May 2017 14:59:21 +0100
parents e86e23110e42
children d60b30ea9b80
comparison
equal deleted inserted replaced
1693:6ad57ce693cb 1695:3c5a87970daa
85 SV_MODULE_REQUIRED([libsamplerate],[samplerate >= 0.1.2],[samplerate.h],[samplerate],[src_new]) 85 SV_MODULE_REQUIRED([libsamplerate],[samplerate >= 0.1.2],[samplerate.h],[samplerate],[src_new])
86 SV_MODULE_REQUIRED([rubberband],[rubberband],[rubberband/RubberBandStretcher.h],[rubberband],[rubberband_new]) 86 SV_MODULE_REQUIRED([rubberband],[rubberband],[rubberband/RubberBandStretcher.h],[rubberband],[rubberband_new])
87 SV_MODULE_REQUIRED([sord],[sord-0 >= 0.5],[sord/sord.h],[sord-0],[sord_world_new]) 87 SV_MODULE_REQUIRED([sord],[sord-0 >= 0.5],[sord/sord.h],[sord-0],[sord_world_new])
88 SV_MODULE_REQUIRED([serd],[serd-0 >= 0.5],[serd/serd.h],[serd-0],[serd_reader_read_file]) 88 SV_MODULE_REQUIRED([serd],[serd-0 >= 0.5],[serd/serd.h],[serd-0],[serd_reader_read_file])
89 89
90 # Cap'n Proto 0.5.3 is the latest release at the time of writing, but 90 # We need a Cap'n Proto version with the expectedSizeInWordsFromPrefix
91 # it lacks the expectedSizeInWordsFromPrefix function which exists in 91 # function, which appeared in v0.6. If we can't find at least that
92 # the git repo. Our check is for that specific symbol, which would 92 # version with pkg-config, we check for the symbol with the compiler.
93 # indicate a git clone, or for a newer release via pkg-config. 93 PKG_CHECK_MODULES([capnp],[capnp >= 0.6],[HAVES="$HAVES HAVE_CAPNP";CXXFLAGS="$CXXFLAGS $capnp_CFLAGS";LIBS="$LIBS $capnp_LIBS"],[AC_MSG_NOTICE([Failed to find required module capnp using pkg-config, trying again by old-fashioned means])])
94 PKG_CHECK_MODULES([capnp],[capnp > 0.5.3],[HAVES="$HAVES HAVE_CAPNP";CXXFLAGS="$CXXFLAGS $capnp_CFLAGS";LIBS="$LIBS $capnp_LIBS"],[AC_MSG_NOTICE([Failed to find required module capnp using pkg-config, trying again by old-fashioned means])])
95 if test -z "$capnp_LIBS" ; then 94 if test -z "$capnp_LIBS" ; then
96 AC_COMPILE_IFELSE([ 95 AC_COMPILE_IFELSE([
97 AC_LANG_SOURCE([[ 96 AC_LANG_SOURCE([[
98 #include <capnp/serialize.h> 97 #include <capnp/serialize.h>
99 int main() { 98 int main() {