regen

1 files changed, 47 insertions, 11 deletions

diff --git a/usr.sbin/nsd/configure b/usr.sbin/nsd/configure
index 4ac06708eb2..41bb666a9fc 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.69 for NSD 4.1.12.
+# Generated by GNU Autoconf 2.69 for NSD 4.1.13.
 #
 # Report bugs to <nsd-bugs@nlnetlabs.nl>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='NSD'
 PACKAGE_TARNAME='nsd'
-PACKAGE_VERSION='4.1.12'
-PACKAGE_STRING='NSD 4.1.12'
+PACKAGE_VERSION='4.1.13'
+PACKAGE_STRING='NSD 4.1.13'
 PACKAGE_BUGREPORT='nsd-bugs@nlnetlabs.nl'
 PACKAGE_URL=''
 
@@ -731,6 +731,7 @@ with_ssl
 enable_nsec3
 enable_minimal_responses
 enable_mmap
+enable_radix_tree
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1283,7 +1284,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 4.1.12 to adapt to many kinds of systems.
+\`configure' configures NSD 4.1.13 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1344,7 +1345,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NSD 4.1.12:";;
+     short | recursive ) echo "Configuration of NSD 4.1.13:";;
    esac
   cat <<\_ACEOF
 
@@ -1377,6 +1378,9 @@ Optional Features:
   --disable-minimal-responses
                           Disable response minimization. More truncation.
   --enable-mmap           Use mmap instead of malloc. Experimental.
+  --disable-radix-tree    You can disable the radix tree and use the red-black
+                          tree for the main lookups, the red-black tree uses
+                          less memory, but uses some more CPU.
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1487,7 +1491,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NSD configure 4.1.12
+NSD configure 4.1.13
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2196,7 +2200,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 4.1.12, which was
+It was created by NSD $as_me 4.1.13, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -8675,7 +8679,6 @@ _ACEOF
 esac
 
 
-
 # we need SSL for TSIG (and maybe also for NSEC3).
 
 
@@ -8978,7 +8981,7 @@ fi
 
 done
 
-	for ac_func in HMAC_CTX_reset HMAC_CTX_new
+	for ac_func in HMAC_CTX_reset HMAC_CTX_new EVP_cleanup ERR_load_crypto_strings OPENSSL_init_crypto
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -8990,6 +8993,22 @@ _ACEOF
 fi
 done
 
+
+	BAKLIBS="$LIBS"
+	LIBS="-lssl $LIBS"
+	for ac_func in OPENSSL_init_ssl
+do :
+  ac_fn_c_check_func "$LINENO" "OPENSSL_init_ssl" "ac_cv_func_OPENSSL_init_ssl"
+if test "x$ac_cv_func_OPENSSL_init_ssl" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_OPENSSL_INIT_SSL 1
+_ACEOF
+
+fi
+done
+
+	LIBS="$BAKLIBS"
+
 else
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No SSL, therefore remote-control is disabled" >&5
 $as_echo "$as_me: WARNING: No SSL, therefore remote-control is disabled" >&2;}
@@ -9135,6 +9154,23 @@ _ACEOF
                 ;;
 esac
 
+# Check whether --enable-radix-tree was given.
+if test "${enable_radix_tree+set}" = set; then :
+  enableval=$enable_radix_tree;
+fi
+
+case "$enable_radix_tree" in
+        no)
+	;;
+	yes|*)
+
+cat >>confdefs.h <<_ACEOF
+#define USE_RADIX_TREE /**/
+_ACEOF
+
+	;;
+esac
+
 
 
 
@@ -9681,7 +9717,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 4.1.12, which was
+This file was extended by NSD $as_me 4.1.13, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9743,7 +9779,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 4.1.12
+NSD config.status 4.1.13
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"