X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=configure.in;h=4bddb0b83218c23c43b65903c689b26a1060e9da;hp=8f21837954c9d59184181f16c749b8db81f7d6c4;hb=82b29e9a3b1dc6b2104ab92ed78bf431a4e55649;hpb=0c2256670fc0822cc5a86bca754186c50f943a1c diff --git a/configure.in b/configure.in index 8f218379..4bddb0b8 100644 --- a/configure.in +++ b/configure.in @@ -1,11 +1,12 @@ dnl Process this file with autoconf to produce a configure script. -dnl $Id: configure.in,v 1.13.2.81 2003/08/08 14:07:11 guus Exp $ +dnl $Id$ -AC_PREREQ(2.57) -AC_INIT(src/tincd.c) +AC_PREREQ(2.59) +AC_INIT +AC_CONFIG_SRCDIR([src/tincd.c]) AM_INIT_AUTOMAKE(tinc, 1.0-cvs) -AM_CONFIG_HEADER(config.h) +AC_CONFIG_HEADERS([config.h]) AM_MAINTAINER_MODE dnl Include the macros from the m4/ directory @@ -94,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 - #endif - #ifdef HAVE_NETDB_H - #include - #endif - #ifdef HAVE_ARPA_INET_H - #include - #endif - #ifdef HAVE_SYS_SOCKET_H - #include - #endif - ] + [], [], [#include "have.h"] ) AC_CHECK_HEADERS([netinet/if_ether.h netinet/ip.h netinet/ip6.h], - [], [], - [#ifdef HAVE_SYS_TYPES_H - #include - #endif - #ifdef HAVE_NETDB_H - #include - #endif - #ifdef HAVE_ARPA_INET_H - #include - #endif - #ifdef HAVE_SYS_SOCKET_H - #include - #endif - #ifdef HAVE_NET_IF_H - #include - #endif - #ifdef HAVE_NETINET_IN_SYSTM_H - #include - #endif - #ifdef HAVE_NETINET_IN_H - #include - #endif - #ifdef HAVE_NETINET_IN6_H - #include - #endif - #ifdef HAVE_NET_ETHERNET_H - #include - #endif - #ifdef HAVE_NET_IF_ARP_H - #include - #endif - ] + [], [], [#include "have.h"] ) AC_CHECK_HEADERS([netinet/tcp.h netinet/ip_icmp.h netinet/icmp6.h], - [], [], - [#ifdef HAVE_SYS_TYPES_H - #include - #endif - #ifdef HAVE_NETDB_H - #include - #endif - #ifdef HAVE_ARPA_INET_H - #include - #endif - #ifdef HAVE_SYS_SOCKET_H - #include - #endif - #ifdef HAVE_NET_IF_H - #include - #endif - #ifdef HAVE_NETINET_IN_SYSTM_H - #include - #endif - #ifdef HAVE_NETINET_IN_H - #include - #endif - #ifdef HAVE_NETINET_IP_H - #include - #endif - #ifdef HAVE_NETINET_IN6_H - #include - #endif - #ifdef HAVE_NETINET_IP6_H - #include - #endif - #ifdef HAVE_NET_ETHERNET_H - #include - #endif - #ifdef HAVE_NET_IF_ARP_H - #include - #endif - #ifdef HAVE_NETINET_IF_ETHER_H - #include - #endif - ] + [], [], [#include "have.h"] ) dnl Checks for typedefs, structures, and compiler characteristics. @@ -197,63 +114,17 @@ AC_STRUCT_TM tinc_ATTRIBUTE(__malloc__) -AC_CHECK_TYPES([socklen_t, 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 - #endif - #ifdef HAVE_NETDB_H - #include - #endif - #ifdef HAVE_ARPA_INET_H - #include - #endif - #ifdef HAVE_SYS_SOCKET_H - #include - #endif - #ifdef HAVE_NET_IF_H - #include - #endif - #ifdef HAVE_NETINET_IN_SYSTM_H - #include - #endif - #ifdef HAVE_NETINET_IN_H - #include - #endif - #ifdef HAVE_NETINET_IP_H - #include - #endif - #ifdef HAVE_NETINET_TCP_H - #include - #endif - #ifdef HAVE_NETINET_IN6_H - #include - #endif - #ifdef HAVE_NETINET_IP6_H - #include - #endif - #ifdef HAVE_NET_ETHERNET_H - #include - #endif - #ifdef HAVE_NET_IF_ARP_H - #include - #endif - #ifdef HAVE_NETINET_IF_ETHER_H - #include - #endif - #ifdef HAVE_NETINET_IP_ICMP_H - #include - #endif - #ifdef HAVE_NETINET_ICMP6_H - #include - #endif - ] +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], , , + [#include "have.h"] ) dnl Checks for library functions. AC_FUNC_MEMCMP AC_FUNC_ALLOCA AC_TYPE_SIGNAL -AC_CHECK_FUNCS([asprintf daemon fcloseall flock ftime fork get_current_dir_name gettimeofday mlockall putenv random select strdup strerror strsignal strtol 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 @@ -266,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 @@ -284,13 +157,13 @@ tinc_LZO dnl Check if support for jumbograms is requested AC_ARG_ENABLE(jumbograms, - AC_HELP_STRING([--enable-jumbograms], [enable support for jumbograms (packets up to 9000 bytes)]), + AS_HELP_STRING([--enable-jumbograms], [enable support for jumbograms (packets up to 9000 bytes)]), [ AC_DEFINE(ENABLE_JUMBOGRAMS, 1, [Support for jumbograms (packets up to 9000 bytes)]) ] ) dnl Check if checkpoint tracing has to be enabled AC_ARG_ENABLE(tracing, - AC_HELP_STRING([--enable-tracing], [enable checkpoint tracing (debugging only)]), + AS_HELP_STRING([--enable-tracing], [enable checkpoint tracing (debugging only)]), [ AC_DEFINE(ENABLE_TRACING, 1, [Checkpoint tracing]) ] )