Mercurial > hg > sonic-visualiser
changeset 1616:e86e23110e42
Minor tweak
| author | Chris Cannam |
|---|---|
| date | Mon, 27 Feb 2017 13:47:05 +0000 |
| parents | cc481995c96d |
| children | afe620d017d7 |
| files | configure configure.ac |
| diffstat | 2 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Mon Feb 27 13:37:43 2017 +0000 +++ b/configure Mon Feb 27 13:47:05 2017 +0000 @@ -5685,7 +5685,7 @@ # 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. Our check is for that specific symbol, which would -# indicate a git clone, or for release 0.5.4 or later via pkg-config. +# indicate a git clone, or for a newer release via pkg-config. pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for capnp" >&5 @@ -5695,12 +5695,12 @@ pkg_cv_capnp_CFLAGS="$capnp_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capnp >= 0.5.4\""; } >&5 - ($PKG_CONFIG --exists --print-errors "capnp >= 0.5.4") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capnp > 0.5.3\""; } >&5 + ($PKG_CONFIG --exists --print-errors "capnp > 0.5.3") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_capnp_CFLAGS=`$PKG_CONFIG --cflags "capnp >= 0.5.4" 2>/dev/null` + pkg_cv_capnp_CFLAGS=`$PKG_CONFIG --cflags "capnp > 0.5.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -5712,12 +5712,12 @@ pkg_cv_capnp_LIBS="$capnp_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capnp >= 0.5.4\""; } >&5 - ($PKG_CONFIG --exists --print-errors "capnp >= 0.5.4") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capnp > 0.5.3\""; } >&5 + ($PKG_CONFIG --exists --print-errors "capnp > 0.5.3") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_capnp_LIBS=`$PKG_CONFIG --libs "capnp >= 0.5.4" 2>/dev/null` + pkg_cv_capnp_LIBS=`$PKG_CONFIG --libs "capnp > 0.5.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -5738,9 +5738,9 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - capnp_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "capnp >= 0.5.4" 2>&1` + capnp_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "capnp > 0.5.3" 2>&1` else - capnp_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "capnp >= 0.5.4" 2>&1` + capnp_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "capnp > 0.5.3" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$capnp_PKG_ERRORS" >&5
--- a/configure.ac Mon Feb 27 13:37:43 2017 +0000 +++ b/configure.ac Mon Feb 27 13:47:05 2017 +0000 @@ -90,8 +90,8 @@ # 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. Our check is for that specific symbol, which would -# indicate a git clone, or for release 0.5.4 or later via pkg-config. -PKG_CHECK_MODULES([capnp],[capnp >= 0.5.4],[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])]) +# indicate a git clone, or for a newer release via pkg-config. +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])]) if test -z "$capnp_LIBS" ; then AC_COMPILE_IFELSE([ AC_LANG_SOURCE([[