resolve conflicts

1 files changed, 60 insertions, 17 deletions

diff --git a/usr.sbin/nsd/configure b/usr.sbin/nsd/configure
index fc6a8672d5c..a7afb0dcd76 100644
--- a/usr.sbin/nsd/configure
+++ b/usr.sbin/nsd/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for NSD 3.2.10.
+# Generated by GNU Autoconf 2.68 for NSD 3.2.11.
 #
 # Report bugs to <nsd-bugs@nlnetlabs.nl>.
 #
@@ -560,8 +560,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='NSD'
 PACKAGE_TARNAME='nsd'
-PACKAGE_VERSION='3.2.10'
-PACKAGE_STRING='NSD 3.2.10'
+PACKAGE_VERSION='3.2.11'
+PACKAGE_STRING='NSD 3.2.11'
 PACKAGE_BUGREPORT='nsd-bugs@nlnetlabs.nl'
 PACKAGE_URL=''
 
@@ -602,6 +602,7 @@ ac_includes_default="\
 #endif"
 
 ac_subst_vars='LTLIBOBJS
+zonestatsfile
 HAVE_SSL
 LIBOBJS
 YFLAGS
@@ -702,6 +703,7 @@ enable_nsec3
 enable_full_prehash
 enable_minimal_responses
 enable_mmap
+enable_zone_stats
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1256,7 +1258,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures NSD 3.2.10 to adapt to many kinds of systems.
+\`configure' configures NSD 3.2.11 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1317,7 +1319,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NSD 3.2.10:";;
+     short | recursive ) echo "Configuration of NSD 3.2.11:";;
    esac
   cat <<\_ACEOF
 
@@ -1335,6 +1337,8 @@ Optional Features:
   --disable-minimal-responses
                           Disable response minimization. More truncation.
   --enable-mmap           Use mmap instead of malloc. Experimental.
+  --enable-zone-stats     Maintain statistics per zone, instead of global
+                          statistics.
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1443,7 +1447,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NSD configure 3.2.10
+NSD configure 3.2.11
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1923,7 +1927,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by NSD $as_me 3.2.10, which was
+It was created by NSD $as_me 3.2.11, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -7562,6 +7566,33 @@ _ACEOF
                 ;;
 esac
 
+#
+# Default zonestatsfile
+#
+zonestatsfile=${localstatedir}/log/nsd.stats
+
+
+cat >>confdefs.h <<_ACEOF
+#define ZONESTATSFILE "`eval echo $zonestatsfile`"
+_ACEOF
+
+# Check whether --enable-zone_stats was given.
+if test "${enable_zone_stats+set}" = set; then :
+  enableval=$enable_zone_stats;
+fi
+
+case "$enable_zone_stats" in
+        yes)
+
+cat >>confdefs.h <<_ACEOF
+#define USE_ZONE_STATS /**/
+_ACEOF
+
+		;;
+        no|*)
+                ;;
+esac
+
 
 
 
@@ -7589,14 +7620,26 @@ fi
 
 # big fat warning
 if test "$enable_checking" = "yes"; then
-        echo "************************************************"
-        echo "* You have activated \"--enable-checking\"       *"
-        echo "*                                              *"
-        echo "* This will instruct NSD to be stricter        *"
-        echo "* when validating its input. This could lead   *"
-        echo "* to a reduced service level.                  *"
-        echo "*                                              *"
-        echo "************************************************"
+        echo "*************************************************"
+        echo "* You have activated \"--enable-checking\"        *"
+        echo "*                                               *"
+        echo "* This will instruct NSD to be stricter         *"
+        echo "* when validating its input. This could lead    *"
+        echo "* to a reduced service level.                   *"
+        echo "*                                               *"
+        echo "*************************************************"
+fi
+
+if test "$enable_zone_stats" = "yes"; then
+        echo "*************************************************"
+        echo "* You have activated \"--enable-zone-stats\"      *"
+        echo "*                                               *"
+        echo "* This will make NSD maintain statistics        *"
+        echo "* on a per zone basis. This could lead to       *"
+        echo "* a reduced service level and an                *"
+        echo "* a larger memory footprint.                    *"
+        echo "*                                               *"
+        echo "*************************************************"
 fi
 
 ac_config_files="$ac_config_files Makefile"
@@ -8119,7 +8162,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by NSD $as_me 3.2.10, which was
+This file was extended by NSD $as_me 3.2.11, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8181,7 +8224,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-NSD config.status 3.2.10
+NSD config.status 3.2.11
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"