X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=configure.in;h=9287c01afdc3b7d39167b299bf4b6d3a0b5bf5d6;hp=b192177b890de72d0a75f057606e09a77421c6ba;hb=2ed154e73192d5e162544bc570abbb3a1df3ec83;hpb=38aa0319ef79124e59b587e6d55f37a79a9d847c

diff --git a/configure.in b/configure.in
index b192177b..9287c01a 100644
--- a/configure.in
+++ b/configure.in
@@ -1,8 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 
-dnl $Id: configure.in,v 1.13.2.69 2003/07/18 14:09:47 guus Exp $
+dnl $Id: configure.in,v 1.13.2.74 2003/07/29 23:21:00 guus Exp $
 
-AC_PREREQ(2.53)
+AC_PREREQ(2.57)
 AC_INIT(src/tincd.c)
 AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
 AM_CONFIG_HEADER(config.h)
@@ -12,7 +12,7 @@ dnl Include the macros from the m4/ directory
 AM_ACLOCAL_INCLUDE(m4)
 
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION(0.11.5)
+AM_GNU_GETTEXT_VERSION(0.12.1)
 
 # Enable GNU extensions.
 # Define this here, not in acconfig's @TOP@ section, since definitions
@@ -68,7 +68,7 @@ case $host_os in
     [ rm -f src/device.c; ln -sf cygwin/device.c src/device.c ]
   ;;
   *mingw*)
-    AC_DEFINE(HAVE_CYGWIN, 1, [MinGW])
+    AC_DEFINE(HAVE_MINGW, 1, [MinGW])
     [ rm -f src/device.c; ln -sf mingw/device.c src/device.c ]
   ;;
   *)
@@ -89,7 +89,7 @@ dnl Checks for libraries.
 
 dnl Checks for header files.
 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 netdb.h arpa/inet.h netinet/in_systm.h netinet/in.h])
+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
@@ -155,7 +155,7 @@ dnl Checks for library functions.
 AC_FUNC_MEMCMP
 AC_FUNC_ALLOCA
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([asprintf daemon fcloseall flock ftime get_current_dir_name putenv select strdup strerror strsignal strtol unsetenv mlockall vsyslog])
+AC_CHECK_FUNCS([asprintf daemon fcloseall flock ftime fork get_current_dir_name gettimeofday mlockall putenv random select strdup strerror strsignal strtol unsetenv vsyslog])
 jm_FUNC_MALLOC
 jm_FUNC_REALLOC
 
@@ -173,20 +173,26 @@ AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo inet_aton])
 AC_CACHE_SAVE
 
 dnl These are defined in files in m4/
-tinc_TUNTAP
+
+case $host_os in
+  *linux*)
+    tinc_TUNTAP
+  ;;
+esac
+
 tinc_OPENSSL
 tinc_ZLIB
 tinc_LZO
 
 dnl Check if support for jumbograms is requested 
 AC_ARG_ENABLE(jumbograms,
-  [  --enable-jumbograms     enable support for jumbograms (packets up to 9000 bytes)],
+  AC_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,
-  [  --enable-tracing        enable checkpoint tracing (debugging only)],
+  AC_HELP_STRING([--enable-tracing], [enable checkpoint tracing (debugging only)]),
   [ AC_DEFINE(ENABLE_TRACING, 1, [Checkpoint tracing]) ]
 )