projects / tinc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update missing definitions, structs describing headers get __packed__ attribute.
[tinc] / configure.in
diff --git a/configure.in b/configure.in
index 52b9196..f72229c 100644 (file)
--- 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.67 2003/07/17 15:06:25 guus Exp $
+dnl $Id: configure.in,v 1.13.2.85 2003/10/08 11:34:55 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,8 +68,9 @@ case $host_os in
     [ rm -f src/device.c; ln -sf cygwin/device.c src/device.c ]
   ;;
   *mingw*)
-    AC_DEFINE(HAVE_CYGWIN, 1, [MinGW])
-    [ rm -f src/device.c; ln -sf mingw/device.c src/device.c ]
+    AC_DEFINE(HAVE_MINGW, 1, [MinGW])
+    [ 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,32 +89,163 @@ 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 netdb.h arpa/inet.h netinet/in_systm.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],
+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
+  ]
+)
+AC_CHECK_HEADERS([netinet/if_ether.h netinet/ip.h netinet/ip6.h],
   [], [],
-  [#include <sys/types.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
+  ]
+)
+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
   ]
 )
 
 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 addrinfo, struct in6_addr, struct sockaddr_in6], , ,
-  [#include <sys/types.h>
-   #include <sys/socket.h>
+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
   ]
 )
 
@@ -121,8 +253,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 fchmod flock ftime fork get_current_dir_name gettimeofday mlockall putenv random select strdup strerror strsignal strtol system unsetenv vsyslog])
 jm_FUNC_MALLOC
 jm_FUNC_REALLOC
 
@@ -140,30 +271,31 @@ 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 
-src/Makefile
-doc/Makefile
-doc/es/Makefile
-lib/Makefile
-po/Makefile.in
-m4/Makefile
-)
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile doc/tincd.8 doc/tinc.conf.5 doc/tincinclude.texi lib/Makefile po/Makefile.in m4/Makefile])
+
+AC_OUTPUT
tinc, the VPN daemon