X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=configure.in;h=1e2b802c39936638015df11e8fc35806e683a2bb;hp=4cea75a806b3c640af76d174177599e1dab75420;hb=721e4caee0f7c6e003c297c95fb6d93bd4102219;hpb=8949404db08f4ab594e60778bb76a9061426d7cc

diff --git a/configure.in b/configure.in
index 4cea75a8..1e2b802c 100644
--- a/configure.in
+++ b/configure.in
@@ -1,14 +1,19 @@
 dnl Process this file with autoconf to produce a configure script.
 
-dnl $Id: configure.in,v 1.13.2.52 2002/07/11 12:55:57 guus Exp $
+dnl $Id: configure.in,v 1.13.2.73 2003/07/29 11:50:39 guus Exp $
 
+AC_PREREQ(2.57)
 AC_INIT(src/tincd.c)
 AM_INIT_AUTOMAKE(tinc, 1.0-cvs)
 AM_CONFIG_HEADER(config.h)
+AM_MAINTAINER_MODE
 
 dnl Include the macros from the m4/ directory
 AM_ACLOCAL_INCLUDE(m4)
 
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION(0.12.1)
+
 # Enable GNU extensions.
 # Define this here, not in acconfig's @TOP@ section, since definitions
 # in the latter don't make it into the configure-time tests.
@@ -25,14 +30,13 @@ AC_PROG_AWK
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-jm_PERL
-
+AC_PROG_RANLIB
 
 AC_ISC_POSIX
 
 dnl Check and set OS
 
-AC_CANONICAL_HOST
+#AC_CANONICAL_HOST
 
 case $host_os in
   *linux*)
@@ -63,6 +67,10 @@ case $host_os in
     AC_DEFINE(HAVE_CYGWIN, 1, [Cygwin])
     [ rm -f src/device.c; ln -sf cygwin/device.c src/device.c ]
   ;;
+  *mingw*)
+    AC_DEFINE(HAVE_MINGW, 1, [MinGW])
+    [ rm -f src/device.c; ln -sf mingw/device.c src/device.c ]
+  ;;
   *)
     AC_MSG_ERROR("Unknown operating system.")
   ;;
@@ -81,9 +89,23 @@ dnl Checks for libraries.
 
 dnl Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \
-net/ethernet.h net/if.h netinet/in_systm.h netinet/ip.h netinet/tcp.h \
-sys/file.h sys/ioctl.h sys/param.h sys/time.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
+   #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
+  ]
+)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
@@ -92,30 +114,51 @@ AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_STRUCT_TM
 
-AC_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t,
-[
-  AC_TRY_COMPILE(
-  [#include <sys/types.h>
-  #include <sys/socket.h>],
-  [socklen_t len = 42; return len;],
-  ac_cv_type_socklen_t=yes,
-  ac_cv_type_socklen_t=no)
-])
-if test $ac_cv_type_socklen_t = yes; then
-  AC_DEFINE(HAVE_SOCKLEN_T, 1, [socklen_t available])
-fi
+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
+  ]
+)
 
 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 getnameinfo])
+AC_CHECK_FUNCS([asprintf daemon fcloseall flock ftime fork get_current_dir_name gettimeofday mlockall putenv select strdup strerror strsignal strtol unsetenv vsyslog])
 jm_FUNC_MALLOC
 jm_FUNC_REALLOC
 
-AM_GNU_GETTEXT
-
 dnl Support for SunOS
 
 AC_CHECK_FUNC(socket, [], [
@@ -125,33 +168,41 @@ AC_CHECK_FUNC(gethostbyname, [], [
   AC_CHECK_LIB(nsl, gethostbyname)
 ])
 
+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]) ]
 )
 
 AC_SUBST(INCLUDES)
 
-AC_OUTPUT(Makefile
+AC_OUTPUT(Makefile 
 src/Makefile
 doc/Makefile
 doc/es/Makefile
-intl/Makefile
 lib/Makefile
-m4/Makefile
 po/Makefile.in
+m4/Makefile
 )