From 0317393bf12827dbef9f3c5c07e3977ba38e3dd5 Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish@gmail.com>
Date: Fri, 23 Jan 2009 13:29:42 -0600
Subject: [PATCH] configure.ac: Fix a couple more includes on NetBSD.

---
 configure    | 11 ++++++++++-
 configure.ac | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index bf768137ff0..b90bb7fa85f 100755
--- a/configure
+++ b/configure
@@ -7965,6 +7965,9 @@ cat >>conftest.$ac_ext <<_ACEOF
      #ifdef HAVE_NETINET_IN_H
      # include <netinet/in.h>
      #endif
+     #ifdef HAVE_NETINET_IN_SYSTM_H
+     # include <netinet/in_systm.h>
+     #endif
      #ifdef HAVE_NETINET_IP_H
      # include <netinet/ip.h>
      #endif
@@ -8019,7 +8022,7 @@ done
 
 
 
-for ac_header in netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h netinet/tcp_timer.h
+for ac_header in netinet/tcp_timer.h netinet/udp_var.h netinet/icmp_var.h netinet/tcp_var.h
 do
 as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -8046,6 +8049,9 @@ cat >>conftest.$ac_ext <<_ACEOF
      #ifdef HAVE_NETINET_IN_H
      # include <netinet/in.h>
      #endif
+     #ifdef HAVE_NETINET_IN_SYSTM_H
+     # include <netinet/in_systm.h>
+     #endif
      #ifdef HAVE_NETINET_IP_H
      # include <netinet/ip.h>
      #endif
@@ -8061,6 +8067,9 @@ cat >>conftest.$ac_ext <<_ACEOF
      #ifdef HAVE_NETINET_TCP_H
      # include <netinet/tcp.h>
      #endif
+     #ifdef HAVE_NETINET_TCP_TIMER_H
+     #include <netinet/tcp_timer.h>
+     #endif
 
 #include <$ac_header>
 _ACEOF
diff --git a/configure.ac b/configure.ac
index 66ad0ac8acc..c2f4588b79c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -402,11 +402,14 @@ AC_CHECK_HEADERS(\
      #ifdef HAVE_NETINET_IN_H
      # include <netinet/in.h>
      #endif
+     #ifdef HAVE_NETINET_IN_SYSTM_H
+     # include <netinet/in_systm.h>
+     #endif
      #ifdef HAVE_NETINET_IP_H
      # include <netinet/ip.h>
      #endif])
 
-AC_CHECK_HEADERS([netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h netinet/tcp_timer.h ],,,
+AC_CHECK_HEADERS([netinet/tcp_timer.h netinet/udp_var.h netinet/icmp_var.h netinet/tcp_var.h ],,,
     [#include <sys/types.h>
      #ifdef HAVE_ALIAS_H
      # include <alias.h>
@@ -420,6 +423,9 @@ AC_CHECK_HEADERS([netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h netinet
      #ifdef HAVE_NETINET_IN_H
      # include <netinet/in.h>
      #endif
+     #ifdef HAVE_NETINET_IN_SYSTM_H
+     # include <netinet/in_systm.h>
+     #endif
      #ifdef HAVE_NETINET_IP_H
      # include <netinet/ip.h>
      #endif
@@ -434,6 +440,9 @@ AC_CHECK_HEADERS([netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h netinet
      #endif
      #ifdef HAVE_NETINET_TCP_H
      # include <netinet/tcp.h>
+     #endif
+     #ifdef HAVE_NETINET_TCP_TIMER_H
+     #include <netinet/tcp_timer.h>
      #endif])
 
 AC_CHECK_HEADERS([linux/ipx.h],,,