From d75bbd0d983b2ef58a5a6c07da3c2dace00fa70d Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 29 Jun 2016 09:29:59 +1000
Subject: [PATCH] 4402.   [bug]           protoc-c is now a hard requirement
 for --enable-dnstap.

---
 CHANGES      |  2 ++
 configure    | 22 +++++++---------------
 configure.in |  2 +-
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/CHANGES b/CHANGES
index 795522dbf7..91d67002e7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+4402.	[bug]		protoc-c is now a hard requirement for --enable-dnstap.
+
 4401.	[misc]		Change LICENSE to MPL 2.0.
 
 4400.	[bug]		ttl policy was not being inherited in policy.py.
diff --git a/configure b/configure
index 1119fcaba5..59e02d1523 100755
--- a/configure
+++ b/configure
@@ -1,18 +1,11 @@
 #! /bin/sh
-# Copyright (C) 2004-2016  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 1996-2003  Internet Software Consortium.
+# Copyright (C) 1996-2016  Internet Systems Consortium, Inc. ("ISC")
 #
-# Permission to use, copy, modify, and/or distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
+#  -----------------------------------------------------------------------------
 #
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69 for BIND 9.11.
@@ -11824,7 +11817,7 @@ else
 fi
 
 
-python="python python3 python3.4 python3.3 python3.2 python3.1 python3.0 python2 python2.7 python2.6 python2.5 python2.4"
+python="python python3 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2 python2.7 python2.6 python2.5 python2.4"
 
 testargparse='try: import argparse
 except: exit(1)'
@@ -20310,8 +20303,7 @@ fi
 
 
 	if test -z "$PROTOC_C"; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The protoc-c program was not found." >&5
-$as_echo "$as_me: WARNING: The protoc-c program was not found." >&2;}
+		as_fn_error $? "The protoc-c program was not found." "$LINENO" 5
 	fi
 
 # Check whether --with-protobuf-c was given.
diff --git a/configure.in b/configure.in
index 66e76f4a48..debbcd675d 100644
--- a/configure.in
+++ b/configure.in
@@ -4097,7 +4097,7 @@ if test "x$use_dnstap" != "xno"; then
 	fi
 	AC_PATH_PROG([PROTOC_C], [protoc-c])
 	if test -z "$PROTOC_C"; then
-		AC_MSG_WARN([The protoc-c program was not found.])
+		AC_MSG_ERROR([The protoc-c program was not found.])
 	fi
 	AC_ARG_WITH([protobuf-c],
 		    AC_HELP_STRING([--with-protobuf-c=path],