merge conflicts

1 files changed, 34 insertions, 17 deletions

diff --git a/usr.sbin/nsd/configure b/usr.sbin/nsd/configure
index 170d7b2f729..fbb22071e7b 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.0.1.
+# Generated by GNU Autoconf 2.69 for NSD 4.0.2.
 #
 # 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.0.1'
-PACKAGE_STRING='NSD 4.0.1'
+PACKAGE_VERSION='4.0.2'
+PACKAGE_STRING='NSD 4.0.2'
 PACKAGE_BUGREPORT='nsd-bugs@nlnetlabs.nl'
 PACKAGE_URL=''
 
@@ -1279,7 +1279,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.0.1 to adapt to many kinds of systems.
+\`configure' configures NSD 4.0.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1340,7 +1340,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NSD 4.0.1:";;
+     short | recursive ) echo "Configuration of NSD 4.0.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1350,8 +1350,9 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-flto          Disable link-time optimization (gcc specific option)
   --disable-largefile     omit support for large files
-  --disable-recvmmsg      Disable recvmmsg and sendmmsg compilation for
-                          compatibility with more Linux kernel versions
+  --enable-recvmmsg       Enable recvmmsg and sendmmsg compilation, faster but
+                          some kernel versions may have implementation
+                          problems
   --enable-root-server    Configure NSD as a root server
   --disable-ipv6          Disables IPv6 support
   --enable-bind8-stats    Enables BIND8 like NSTATS & XSTATS
@@ -1473,7 +1474,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NSD configure 4.0.1
+NSD configure 4.0.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2182,7 +2183,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.0.1, which was
+It was created by NSD $as_me 4.0.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3782,6 +3783,11 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
 
 
 
+if test "$ac_cv_header_minix_config_h" = "yes"; then
+
+$as_echo "#define _NETBSD_SOURCE 1" >>confdefs.h
+
+fi
 
 case "$prefix" in
 	NONE)
@@ -5425,7 +5431,7 @@ $as_echo_n "checking for libevent... " >&6; }
         fi
         for dir in $withval; do
             thedir="$dir"
-            if test -f "$dir/include/event.h"; then
+            if test -f "$dir/include/event.h" -o -f "$dir/include/event2/event.h"; then
                 found_libevent="yes"
 				if test "$thedir" != "/usr"; then
                     CPPFLAGS="$CPPFLAGS -I$thedir/include"
@@ -5450,8 +5456,18 @@ You can restart ./configure --with-libevent=no to use a builtin alternative." "$
         else
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $thedir" >&5
 $as_echo "found in $thedir" >&6; }
-	    	    if test "$thedir" != "/usr" -a "$thedir" != ""; then
-                LDFLAGS="$LDFLAGS -L$thedir/lib"
+	    	    if test ! -f $thedir/lib/libevent.a -a ! -f $thedir/lib/libevent.so -a -d "$thedir/lib/event2"; then
+		LDFLAGS="$LDFLAGS -L$thedir/lib/event2"
+
+	if test "x$enable_rpath" = xyes; then
+		if echo "$thedir/lib/event2" | grep "^/" >/dev/null; then
+			RUNTIME_PATH="$RUNTIME_PATH -R$thedir/lib/event2"
+		fi
+	fi
+
+	    else
+		    		    if test "$thedir" != "/usr" -a "$thedir" != ""; then
+			LDFLAGS="$LDFLAGS -L$thedir/lib"
 
 	if test "x$enable_rpath" = xyes; then
 		if echo "$thedir/lib" | grep "^/" >/dev/null; then
@@ -5459,6 +5475,7 @@ $as_echo "found in $thedir" >&6; }
 		fi
 	fi
 
+		    fi
 	    fi
         fi
 	# check for library used by libevent after 1.3c
@@ -7796,9 +7813,7 @@ if test "${enable_recvmmsg+set}" = set; then :
 fi
 
 case "$enable_recvmmsg" in
-        no)
-                ;;
-        yes|*)
+        yes)
 		ac_fn_c_check_func "$LINENO" "recvmmsg" "ac_cv_func_recvmmsg"
 if test "x$ac_cv_func_recvmmsg" = xyes; then :
 
@@ -7873,6 +7888,8 @@ fi
 
 
 		;;
+        no|*)
+                ;;
 esac
 
 # check if setreuid en setregid fail, on MacOSX10.4(darwin8).
@@ -9355,7 +9372,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.0.1, which was
+This file was extended by NSD $as_me 4.0.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9417,7 +9434,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.0.1
+NSD config.status 4.0.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"