From 1fe56637874a1e93882a2ca6ffb8c50a773f80e4 Mon Sep 17 00:00:00 2001
From: Guus Sliepen <guus@tinc-vpn.org>
Date: Thu, 31 Jul 2003 13:18:34 +0000
Subject: [PATCH] No easy way to properly detect header files...

---
 configure.in | 118 +++++++++++++++++++++++++++++++++++++++++++++------
 src/route.c  |   5 +--
 system.h     |   8 ++++
 3 files changed, 115 insertions(+), 16 deletions(-)

diff --git a/configure.in b/configure.in
index 5fe9f4d4..844999f6 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-dnl $Id: configure.in,v 1.13.2.77 2003/07/31 11:17:39 guus Exp $
+dnl $Id: configure.in,v 1.13.2.78 2003/07/31 13:18:34 guus Exp $
 
 AC_PREREQ(2.57)
 AC_INIT(src/tincd.c)
@@ -88,22 +88,101 @@ fi
 dnl Checks for libraries.
 
 dnl Checks for header files.
+dnl We do this in multiple stages, because unlike Linux all the other operating systems really suck and don't include their own dependencies.
+
 AC_HEADER_STDC
-AC_CHECK_HEADERS([stdbool.h syslog.h sys/file.h sys/ioctl.h sys/param.h sys/time.h sys/socket.h sys/wait.h sys/mman.h netdb.h arpa/inet.h netinet/in_systm.h netinet/in.h])
-AC_CHECK_HEADERS([net/ethernet.h net/if.h net/if_arp.h netinet/if_ether.h netinet/ip.h netinet/tcp.h netinet/ip_icmp.h netinet/ip6.h netinet/icmp6.h],
+AC_CHECK_HEADERS([stdbool.h syslog.h sys/file.h sys/ioctl.h sys/param.h sys/time.h sys/socket.h sys/wait.h sys/mman.h netdb.h arpa/inet.h])
+AC_CHECK_HEADERS([net/if.h net/ethernet.h net/if_arp.h netinet/in_systm.h netinet/in.h netinet/in6.h],
   [], [],
   [#ifdef HAVE_SYS_TYPES_H
    #include <sys/types.h>
    #endif
+   #ifdef HAVE_NETDB_H
+   #include <netdb.h>
+   #endif
+   #ifdef HAVE_ARPA_INET_H
+   #include <arpa/inet.h>
+   #endif
    #ifdef HAVE_SYS_SOCKET_H
    #include <sys/socket.h>
    #endif
+  ]
+)
+AC_CHECK_HEADERS([netinet/if_ether.h netinet/ip.h netinet/ip6.h],
+  [], [],
+  [#ifdef HAVE_SYS_TYPES_H
+   #include <sys/types.h>
+   #endif
+   #ifdef HAVE_NETDB_H
+   #include <netdb.h>
+   #endif
+   #ifdef HAVE_ARPA_INET_H
+   #include <arpa/inet.h>
+   #endif
+   #ifdef HAVE_SYS_SOCKET_H
+   #include <sys/socket.h>
+   #endif
+   #ifdef HAVE_NET_IF_H
+   #include <net/if.h>
+   #endif
    #ifdef HAVE_NETINET_IN_SYSTM_H
    #include <netinet/in_systm.h>
    #endif
    #ifdef HAVE_NETINET_IN_H
    #include <netinet/in.h>
    #endif
+   #ifdef HAVE_NETINET_IN6_H
+   #include <netinet/in6.h>
+   #endif
+   #ifdef HAVE_NET_ETHERNET_H
+   #include <net/ethernet.h>
+   #endif
+   #ifdef HAVE_NET_IF_ARP_H
+   #include <net/if_arp.h>
+   #endif
+  ]
+)
+AC_CHECK_HEADERS([netinet/tcp.h netinet/ip_icmp.h netinet/icmp6.h],
+  [], [],
+  [#ifdef HAVE_SYS_TYPES_H
+   #include <sys/types.h>
+   #endif
+   #ifdef HAVE_NETDB_H
+   #include <netdb.h>
+   #endif
+   #ifdef HAVE_ARPA_INET_H
+   #include <arpa/inet.h>
+   #endif
+   #ifdef HAVE_SYS_SOCKET_H
+   #include <sys/socket.h>
+   #endif
+   #ifdef HAVE_NET_IF_H
+   #include <net/if.h>
+   #endif
+   #ifdef HAVE_NETINET_IN_SYSTM_H
+   #include <netinet/in_systm.h>
+   #endif
+   #ifdef HAVE_NETINET_IN_H
+   #include <netinet/in.h>
+   #endif
+   #ifdef HAVE_NETINET_IP_H
+   #include <netinet/ip.h>
+   #endif
+   #ifdef HAVE_NETINET_IN6_H
+   #include <netinet/in6.h>
+   #endif
+   #ifdef HAVE_NETINET_IP6_H
+   #include <netinet/ip6.h>
+   #endif
+   #ifdef HAVE_NET_ETHERNET_H
+   #include <net/ethernet.h>
+   #endif
+   #ifdef HAVE_NET_IF_ARP_H
+   #include <net/if_arp.h>
+   #endif
+   #ifdef HAVE_NETINET_IF_ETHER_H
+   #include <netinet/if_ether.h>
+   #endif
   ]
 )
 
@@ -121,17 +200,17 @@ AC_CHECK_TYPES([socklen_t, struct arphdr, struct ether_arp, struct in_addr, stru
   [#ifdef HAVE_SYS_TYPES_H
    #include <sys/types.h>
    #endif
-   #ifdef HAVE_SYS_SOCKET_H
-   #include <sys/socket.h>
-   #endif
    #ifdef HAVE_NETDB_H
    #include <netdb.h>
    #endif
-   #ifdef HAVE_NET_IF_ARP_H
-   #include <net/if_arp.h>
+   #ifdef HAVE_ARPA_INET_H
+   #include <arpa/inet.h>
    #endif
-   #ifdef HAVE_NETINET_IF_ETHER_H
-   #include <netinet/if_ether.h>
+   #ifdef HAVE_SYS_SOCKET_H
+   #include <sys/socket.h>
+   #endif
+   #ifdef HAVE_NET_IF_H
+   #include <net/if.h>
    #endif
    #ifdef HAVE_NETINET_IN_SYSTM_H
    #include <netinet/in_systm.h>
@@ -142,12 +221,27 @@ AC_CHECK_TYPES([socklen_t, struct arphdr, struct ether_arp, struct in_addr, stru
    #ifdef HAVE_NETINET_IP_H
    #include <netinet/ip.h>
    #endif
-   #ifdef HAVE_NETINET_IP_ICMP_H
-   #include <netinet/ip_icmp.h>
+   #ifdef HAVE_NETINET_TCP_H
+   #include <netinet/tcp.h>
+   #endif
+   #ifdef HAVE_NETINET_IN6_H
+   #include <netinet/in6.h>
    #endif
    #ifdef HAVE_NETINET_IP6_H
    #include <netinet/ip6.h>
    #endif
+   #ifdef HAVE_NET_ETHERNET_H
+   #include <net/ethernet.h>
+   #endif
+   #ifdef HAVE_NET_IF_ARP_H
+   #include <net/if_arp.h>
+   #endif
+   #ifdef HAVE_NETINET_IF_ETHER_H
+   #include <netinet/if_ether.h>
+   #endif
+   #ifdef HAVE_NETINET_IP_ICMP_H
+   #include <netinet/ip_icmp.h>
+   #endif
    #ifdef HAVE_NETINET_ICMP6_H
    #include <netinet/icmp6.h>
    #endif
diff --git a/src/route.c b/src/route.c
index 7dd7635f..5823f379 100644
--- a/src/route.c
+++ b/src/route.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: route.c,v 1.1.2.62 2003/07/22 20:55:20 guus Exp $
+    $Id: route.c,v 1.1.2.63 2003/07/31 13:18:34 guus Exp $
 */
 
 #include "system.h"
@@ -31,9 +31,6 @@
 #ifdef HAVE_NETINET_IP_ICMP_H
 #include <netinet/ip_icmp.h>
 #endif
-#ifdef HAVE_NETINET_IP6_H
-#include <netinet/ip6.h>
-#endif
 #ifdef HAVE_NETINET_ICMP6_H
 #include <netinet/icmp6.h>
 #endif
diff --git a/system.h b/system.h
index 0d7b3187..d3aa8429 100644
--- a/system.h
+++ b/system.h
@@ -120,6 +120,14 @@ typedef int bool;
 #include <netinet/tcp.h>
 #endif
 
+#ifdef HAVE_NETINET_IN6_H
+#include <netinet/in6.h>
+#endif
+
+#ifdef HAVE_NETINET_IP6_H
+#include <netinet/ip6.h>
+#endif
+
 #ifdef HAVE_MINGW
 #include <windows.h>
 #include <winsock2.h>
-- 
2.39.5