From c92a985849f564da80dad5ea9353256b9d3c75db Mon Sep 17 00:00:00 2001
From: David Lamparter <equinox@opensourcerouting.org>
Date: Sun, 28 Feb 2016 18:30:01 +0100
Subject: [PATCH] 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)
---
 .travis.yml  | 1 +
 configure.ac | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f6d81b9..a827621 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ addons:
     - gcc-4.8
     - g++-4.8
     - libgtest-dev
+    - capnproto
 
 # use gcc-4.8
 install:
diff --git a/configure.ac b/configure.ac
index de45840..f6e62cc 100755
--- a/configure.ac
+++ b/configure.ac
@@ -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]))