4402. [bug] protoc-c is now a hard requirement for --enable-dnstap.

diff --git a/CHANGES b/CHANGES
index 795522dbf773e031294f50b94dea0c7d4626cc09..91d67002e7290444848792631cc5945fd62deb69 100644 (file)
--- 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 1119fcaba5016646502fbb07a2760f57e08d218c..59e02d1523585477915acf9ffd8d931b1230b0bf 100755 (executable)
--- 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 66e76f4a480c12c854f5eaec8b01e3334535ea20..debbcd675d2f6ac29a2b450d665795dc8c0203f0 100644 (file)
--- 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],