Commit e8555412 authored by Mark Andrews's avatar Mark Andrews
Browse files

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

(cherry picked from commit d75bbd0d)
parent 99049490
4402. [bug] protoc-c is now a hard requirement for --enable-dnstap.
--- 9.11.0b1 released --- --- 9.11.0b1 released ---
4401. [misc] Change LICENSE to MPL 2.0. 4401. [misc] Change LICENSE to MPL 2.0.
......
#! /bin/sh #! /bin/sh
# Copyright (C) 2004-2016 Internet Systems Consortium, Inc. ("ISC") # Copyright (C) 1996-2016 Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 1996-2003 Internet Software Consortium.
# #
# Permission to use, copy, modify, and/or distribute this software for any # This Source Code Form is subject to the terms of the Mozilla Public
# purpose with or without fee is hereby granted, provided that the above # License, v. 2.0. If a copy of the MPL was not distributed with this
# copyright notice and this permission notice appear in all copies. # 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. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for BIND 9.11. # Generated by GNU Autoconf 2.69 for BIND 9.11.
...@@ -11824,7 +11817,7 @@ else ...@@ -11824,7 +11817,7 @@ else
fi 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 testargparse='try: import argparse
except: exit(1)' except: exit(1)'
...@@ -20310,8 +20303,7 @@ fi ...@@ -20310,8 +20303,7 @@ fi
   
   
if test -z "$PROTOC_C"; then if test -z "$PROTOC_C"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The protoc-c program was not found." >&5 as_fn_error $? "The protoc-c program was not found." "$LINENO" 5
$as_echo "$as_me: WARNING: The protoc-c program was not found." >&2;}
fi fi
   
# Check whether --with-protobuf-c was given. # Check whether --with-protobuf-c was given.
......
...@@ -4097,7 +4097,7 @@ if test "x$use_dnstap" != "xno"; then ...@@ -4097,7 +4097,7 @@ if test "x$use_dnstap" != "xno"; then
fi fi
AC_PATH_PROG([PROTOC_C], [protoc-c]) AC_PATH_PROG([PROTOC_C], [protoc-c])
if test -z "$PROTOC_C"; then 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 fi
AC_ARG_WITH([protobuf-c], AC_ARG_WITH([protobuf-c],
AC_HELP_STRING([--with-protobuf-c=path], AC_HELP_STRING([--with-protobuf-c=path],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment