X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=configure.in;h=4bddb0b83218c23c43b65903c689b26a1060e9da;hp=bae72e31c369b3a1e46c6f8c201584f66d73a288;hb=2c40495747945bc497dac65b734a4995ab3400a3;hpb=7717cb0c54cc1b736b9f210b180c3cb3f4663ded

diff --git a/configure.in b/configure.in
index bae72e31..4bddb0b8 100644
--- a/configure.in
+++ b/configure.in
@@ -95,97 +95,13 @@ dnl We do this in multiple stages, because unlike Linux all the other operating
 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])
 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
-  ]
+  [], [], [#include "have.h"]
 )
 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
-  ]
+  [], [], [#include "have.h"]
 )
 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
-  ]
+  [], [], [#include "have.h"]
 )
 
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -199,62 +115,16 @@ AC_STRUCT_TM
 tinc_ATTRIBUTE(__malloc__)
 
 AC_CHECK_TYPES([socklen_t, struct ether_header, struct arphdr, struct ether_arp, struct in_addr, struct addrinfo, struct ip, struct icmp, struct in6_addr, struct sockaddr_in6, struct ip6_hdr, struct icmp6_hdr, struct nd_neighbor_solicit, struct nd_opt_hdr], , ,
-  [#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_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
-  ]
+  [#include "have.h"]
 )
 
 dnl Checks for library functions.
 AC_FUNC_MEMCMP
 AC_FUNC_ALLOCA
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([asprintf daemon fchmod flock ftime fork get_current_dir_name gettimeofday mlockall putenv random select strdup strerror strsignal strtol system unsetenv vsyslog])
+AC_CHECK_FUNCS([asprintf daemon fchmod flock ftime fork get_current_dir_name gettimeofday mlockall putenv random select strdup strerror strsignal strtol system unsetenv vsyslog],
+  [], [], [#include "have.h"]
+)
 jm_FUNC_MALLOC
 jm_FUNC_REALLOC
 
@@ -267,7 +137,9 @@ AC_CHECK_FUNC(gethostbyname, [], [
   AC_CHECK_LIB(nsl, gethostbyname)
 ])
 
-AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo inet_aton])
+AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo inet_aton],
+  [], [], [#include "have.h"]
+)
 
 AC_CACHE_SAVE