X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=configure.in;h=91545da23428be80d652a4494d7a063b8ae47e29;hp=1e2b802c39936638015df11e8fc35806e683a2bb;hb=f7b9761000000063bd00460af4b57117db7361e4;hpb=4370b98bb1dfa9eb1e400549cb6fcb6711aa1b29

diff --git a/configure.in b/configure.in
index 1e2b802c..91545da2 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.73 2003/07/29 11:50:39 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
@@ -45,11 +46,11 @@ case $host_os in
   ;;
   *freebsd*)
     AC_DEFINE(HAVE_FREEBSD, 1, [FreeBSD])
-    [ rm -f src/device.c; ln -sf freebsd/device.c src/device.c ]
+    [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
   ;;
   *darwin*)
     AC_DEFINE(HAVE_DARWIN, 1, [Darwin (MacOS/X)])
-    [ rm -f src/device.c; ln -sf darwin/device.c src/device.c ]
+    [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
   ;;
   *solaris*)
     AC_DEFINE(HAVE_SOLARIS, 1, [Solaris/SunOS])
@@ -57,11 +58,16 @@ case $host_os in
   ;;
   *openbsd*)
     AC_DEFINE(HAVE_OPENBSD, 1, [OpenBSD])
-    [ rm -f src/device.c; ln -sf openbsd/device.c src/device.c ]
+    [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
   ;;
   *netbsd*)
     AC_DEFINE(HAVE_NETBSD, 1, [NetBSD])
-    [ rm -f src/device.c; ln -sf netbsd/device.c src/device.c ]
+    [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
+  ;;
+  *bsd*)
+    AC_MSG_WARN("Unknown BSD variant, tinc might not compile or work!")
+    AC_DEFINE(HAVE_BSD, 1, [Unknown BSD variant])
+    [ rm -f src/device.c; ln -sf bsd/device.c src/device.c ]
   ;;
   *cygwin*)
     AC_DEFINE(HAVE_CYGWIN, 1, [Cygwin])
@@ -69,7 +75,8 @@ case $host_os in
   ;;
   *mingw*)
     AC_DEFINE(HAVE_MINGW, 1, [MinGW])
-    [ rm -f src/device.c; ln -sf mingw/device.c src/device.c ]
+    [ rm -f src/device.c; cp -f src/mingw/device.c src/device.c ]
+    LIBS="$LIBS -lws2_32"
   ;;
   *)
     AC_MSG_ERROR("Unknown operating system.")
@@ -88,74 +95,41 @@ 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([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],
-  [], [],
-  [#ifdef HAVE_SYS_TYPES_H
-   #include <sys/types.h>
-   #endif
-   #ifdef HAVE_SYS_SOCKET_H
-   #include <sys/socket.h>
-   #endif
-   #ifdef HAVE_NETINET_IN_SYSTM_H
-   #include <netinet/in_systm.h>
-   #endif
-   #ifdef HAVE_NETINET_IN_H
-   #include <netinet/in.h>
-   #endif
-  ]
+AC_CHECK_HEADERS([stdbool.h syslog.h sys/file.h sys/ioctl.h sys/mman.h sys/param.h sys/socket.h sys/time.h sys/uio.h sys/wait.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],
+  [], [], [#include "have.h"]
+)
+AC_CHECK_HEADERS([netinet/if_ether.h netinet/ip.h netinet/ip6.h],
+  [], [], [#include "have.h"]
+)
+AC_CHECK_HEADERS([netinet/tcp.h netinet/ip_icmp.h netinet/icmp6.h],
+  [], [], [#include "have.h"]
 )
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
+AC_C_VOLATILE
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_STRUCT_TM
 
-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 <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>
-   #endif
-   #ifdef HAVE_NETINET_IF_ETHER_H
-   #include <netinet/if_ether.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_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
-  ]
+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], , ,
+  [#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 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 writev],
+  [], [], [#include "have.h"]
+)
 jm_FUNC_MALLOC
 jm_FUNC_REALLOC
 
@@ -168,7 +142,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
 
@@ -186,23 +162,18 @@ 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]) ]
 )
 
 AC_SUBST(INCLUDES)
 
-AC_OUTPUT(Makefile 
-src/Makefile
-doc/Makefile
-doc/es/Makefile
-lib/Makefile
-po/Makefile.in
-m4/Makefile
-)
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile lib/Makefile po/Makefile.in m4/Makefile])
+
+AC_OUTPUT