Mercurial > hg > sonic-visualiser
changeset 1534:782025ae1249
Update configure to note capnp version dependency
author | Chris Cannam |
---|---|
date | Wed, 11 Jan 2017 17:36:21 +0000 (2017-01-11) |
parents | 6e99c789fab1 |
children | 2247f02f93b7 |
files | configure configure.ac |
diffstat | 2 files changed, 19 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Wed Jan 11 14:21:44 2017 +0000 +++ b/configure Wed Jan 11 17:36:21 2017 +0000 @@ -5688,11 +5688,18 @@ fi +# Cap'n Proto 0.5.3 is the latest release at the time of writing, but +# it lacks the expectedSizeInWordsFromPrefix function which exists in +# the git repo. Check for a newer release or, if that's not found with +# pkg-config, check for that specific symbol (mangled). +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking specifically for a newer Cap'n Proto than the 0.5.3 release" >&5 +$as_echo "$as_me: checking specifically for a newer Cap'n Proto than the 0.5.3 release" >&6;} + SV_MODULE_MODULE=capnp -SV_MODULE_VERSION_TEST="capnp >= 0.6" +SV_MODULE_VERSION_TEST="capnp >= 0.5.4" SV_MODULE_HEADER=capnp/common.h SV_MODULE_LIB=capnp -SV_MODULE_FUNC= +SV_MODULE_FUNC=_ZN5capnp29expectedSizeInWordsFromPrefixEN2kj8ArrayPtrIKNS_4wordEEE SV_MODULE_HAVE=HAVE_$(echo capnp | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 if test -n "$capnp_LIBS" ; then @@ -5840,10 +5847,10 @@ SV_MODULE_MODULE=kj -SV_MODULE_VERSION_TEST="kj >= 0.6" +SV_MODULE_VERSION_TEST="kj >= 0.5.4" SV_MODULE_HEADER=kj/common.h SV_MODULE_LIB=kj -SV_MODULE_FUNC= +SV_MODULE_FUNC=_ZN2kj20BufferedOutputStreamD0Ev SV_MODULE_HAVE=HAVE_$(echo kj | tr 'a-z' 'A-Z') SV_MODULE_FAILED=1 if test -n "$kj_LIBS" ; then
--- a/configure.ac Wed Jan 11 14:21:44 2017 +0000 +++ b/configure.ac Wed Jan 11 17:36:21 2017 +0000 @@ -86,8 +86,14 @@ SV_MODULE_REQUIRED([rubberband],[rubberband],[rubberband/RubberBandStretcher.h],[rubberband],[rubberband_new]) SV_MODULE_REQUIRED([sord],[sord-0 >= 0.5],[sord/sord.h],[sord-0],[sord_world_new]) SV_MODULE_REQUIRED([serd],[serd-0 >= 0.5],[serd/serd.h],[serd-0],[serd_reader_read_file]) -SV_MODULE_REQUIRED([capnp],[capnp >= 0.6],[capnp/common.h],[capnp],[]) -SV_MODULE_REQUIRED([kj],[kj >= 0.6],[kj/common.h],[kj],[]) + +# Cap'n Proto 0.5.3 is the latest release at the time of writing, but +# it lacks the expectedSizeInWordsFromPrefix function which exists in +# the git repo. Check for a newer release or, if that's not found with +# pkg-config, check for that specific symbol (mangled). +AC_MSG_NOTICE([checking specifically for a newer Cap'n Proto than the 0.5.3 release]) +SV_MODULE_REQUIRED([capnp],[capnp >= 0.5.4],[capnp/common.h],[capnp],[_ZN5capnp29expectedSizeInWordsFromPrefixEN2kj8ArrayPtrIKNS_4wordEEE]) +SV_MODULE_REQUIRED([kj],[kj >= 0.5.4],[kj/common.h],[kj],[_ZN2kj20BufferedOutputStreamD0Ev]) SV_MODULE_OPTIONAL([liblo],[],[lo/lo.h],[lo],[lo_address_new]) SV_MODULE_OPTIONAL([portaudio],[portaudio-2.0 >= 19],[portaudio.h],[portaudio],[Pa_IsFormatSupported])