configure.ac: fix tcp_var detection (2/3) (try 2)

[Austin English]

tcp_var depends on tcp_timer on NetBSD, so moving its detection to be
separate from and after tcp_var.

Changelog:
Try 1 wasn't a proper git diff.
Combined a couple other individual patches into a single series.

Tested both on NetBSD 4.0.1 / Ubuntu Intrepid.

Helps fix bugs 16661/16931.

-- 
-Austin
-------------- next part --------------
From c2d6b9311d225560c0cfb4d81685827a1a46e3a0 Mon Sep 17 00:00:00 2001
From: Austin English <austinenglish at gmail.com>
Date: Thu, 22 Jan 2009 10:44:55 -0600
Subject: [PATCH] configure.ac: fix tcp_var detection

---
 configure.ac |   32 +++++++++++++++++++++++++++++++-
 1 files changed, 31 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 66ad0ac..f5cf0a0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -406,7 +406,7 @@ AC_CHECK_HEADERS(\
      # 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/udp_var.h netinet/icmp_var.h netinet/tcp_timer.h ],,,
     [#include <sys/types.h>
      #ifdef HAVE_ALIAS_H
      # include <alias.h>
@@ -436,6 +436,36 @@ AC_CHECK_HEADERS([netinet/tcp_var.h netinet/udp_var.h netinet/icmp_var.h netinet
      # include <netinet/tcp.h>
      #endif])
 
+AC_CHECK_HEADERS([netinet/tcp_var.h],,,
+    [#include <sys/types.h>
+     #ifdef HAVE_ALIAS_H
+     # include <alias.h>
+     #endif
+     #ifdef HAVE_SYS_SOCKET_H
+     # include <sys/socket.h>
+     #endif
+     #ifdef HAVE_SYS_SOCKETVAR_H
+     # include <sys/socketvar.h>
+     #endif
+     #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
+     #ifdef HAVE_NETINET_IP_VAR_H
+     # include <netinet/ip_var.h>
+     #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],,,
     [#include <sys/types.h>
      #ifdef HAVE_ASM_TYPES_H
-- 
1.5.4.3