Move all #ifdef HAVE_HEADER_H #include <header.h> to have.h,

this allows for simplification of configure.in.

diff --git a/configure.in b/configure.in
index bae72e3..4bddb0b 100644 (file)
--- 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
 

diff --git a/have.h b/have.h
new file mode 100644 (file)
index 0000000..e5b0af8
--- /dev/null
+++ b/have.h
@@ -0,0 +1,148 @@
+/*
+    have.h -- include headers which are known to exist
+    Copyright (C) 1998-2004 Ivo Timmermans <ivo@tinc-vpn.org>
+                  2003-2004 Guus Sliepen <guus@tinc-vpn.org>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+
+#ifndef __TINC_HAVE_H__
+#define __TINC_HAVE_H__
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <ctype.h>
+#include <signal.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#ifdef HAVE_STDBOOL_H
+#include <stdbool.h>
+#endif
+
+#ifdef HAVE_TERMIOS_H
+#include <termios.h>
+#endif
+
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif
+
+/* Include system specific headers */
+
+#ifdef HAVE_SYSLOG_H
+#include <syslog.h>
+#endif
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+
+#ifdef HAVE_SYS_FILE_H
+#include <sys/file.h>
+#endif
+
+#ifdef HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
+
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+
+/* SunOS really wants sys/socket.h BEFORE net/if.h,
+   and FreeBSD wants these lines below the rest. */
+
+#ifdef HAVE_NETDB_H
+#include <netdb.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_ARPA_INET_H
+#include <arpa/inet.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_IP_ICMP_H
+#include <netinet/ip_icmp.h>
+#endif
+
+#ifdef HAVE_NETINET_ICMP6_H
+#include <netinet/icmp6.h>
+#endif
+
+#ifdef HAVE_NETINET_IF_ETHER_H
+#include <netinet/if_ether.h>
+#endif
+
+#ifdef HAVE_MINGW
+#include <windows.h>
+#include <winsock2.h>
+#endif
+
+#endif /* __TINC_SYSTEM_H__ */

diff --git a/system.h b/system.h
index b0d23c8..02fc2ee 100644 (file)
--- a/system.h
+++ b/system.h
@@ -23,116 +23,14 @@
 
 #include "config.h"
 
-/* Include standard headers */
+#include "have.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <ctype.h>
-#include <signal.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-
-#ifdef HAVE_STDBOOL_H
-#include <stdbool.h>
-#else
+#ifndef HAVE_STDBOOL_H
 typedef int bool;
 #define true 1
 #define false 0
 #endif
 
-#ifdef HAVE_TERMIOS_H
-#include <termios.h>
-#endif
-
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
-/* Include system specific headers */
-
-#ifdef HAVE_SYSLOG_H
-#include <syslog.h>
-#endif
-
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
-#ifdef HAVE_SYS_STAT_H
-#include <sys/stat.h>
-#endif
-
-#ifdef HAVE_SYS_FILE_H
-#include <sys/file.h>
-#endif
-
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
-
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
-
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-
-/* SunOS really wants sys/socket.h BEFORE net/if.h,
-   and FreeBSD wants these lines below the rest. */
-
-#ifdef HAVE_NETDB_H
-#include <netdb.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_ARPA_INET_H
-#include <arpa/inet.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_MINGW
-#include <windows.h>
-#include <winsock2.h>
-#endif
-
 /* Include localisation support */
 
 #include "gettext.h"