Fix Travis CI even more...

automake 1.11 is sufficient (and what's installed by default on CI
boxes).  Also disable cap'n proto reference (it's not actually used)
This commit is contained in:
David Lamparter 2016-02-28 18:30:01 +01:00
parent c02d6d59d0
commit c92a985849
2 changed files with 5 additions and 4 deletions

View file

@ -9,7 +9,7 @@ AC_CANONICAL_BUILD()
AC_CANONICAL_HOST()
AC_CANONICAL_TARGET()
AM_INIT_AUTOMAKE(1.14)
AM_INIT_AUTOMAKE(1.11)
AM_SILENT_RULES([yes])
AC_CONFIG_HEADERS([config.h])
@ -31,9 +31,9 @@ if test x"${enable_werror}" = x"yes" ; then
fi
AC_SUBST(WERROR)
PKG_CHECK_MODULES(CAPNP, [capnp >= 0.5.2], [], [
AC_MSG_ERROR([capnproto base package (0.5.2 or newer) not found])
])
#PKG_CHECK_MODULES(CAPNP, [capnp >= 0.5.2], [], [
# AC_MSG_ERROR([capnproto base package (0.5.2 or newer) not found])
#])
AC_ARG_WITH(gtest,
AS_HELP_STRING([--without-gtest], [disable unit tests using gtest]))