X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=configure.in;h=3cb6a4de0efb1b6e8e94ad84d969fcbba0a91293;hp=9f9849d6bb25e10e3b664c9b4310aba3f461bb8d;hb=e9576632dc4b780b867044269d06cc50f76d8c05;hpb=912e7e968f4888d62b3c620893a70e825599973b diff --git a/configure.in b/configure.in index 9f9849d..3cb6a4d 100644 --- a/configure.in +++ b/configure.in @@ -1,22 +1,21 @@ dnl Process this file with autoconf to produce a configure script. -dnl $Id: configure.in,v 1.13.2.54 2002/08/24 12:11:38 guus Exp $ +dnl $Id$ -AC_PREREQ(2.50) -AC_INIT(src/tincd.c) +AC_PREREQ(2.61) +AC_INIT +AC_CONFIG_SRCDIR([src/tincd.c]) AM_INIT_AUTOMAKE(tinc, 1.0-cvs) -AM_CONFIG_HEADER(config.h) - -dnl Include the macros from the m4/ directory -AM_ACLOCAL_INCLUDE(m4) +AC_CONFIG_HEADERS([config.h]) +AM_MAINTAINER_MODE AM_GNU_GETTEXT([external]) -AM_GNU_GETTEXT_VERSION(0.11.5) +AM_GNU_GETTEXT_VERSION(0.14.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. -AC_DEFINE([_GNU_SOURCE], 1, [Enable GNU extenstions]) +AC_GNU_SOURCE AC_DEFINE([__USE_BSD], 1, [Enable BSD extensions]) ALL_LINGUAS="nl" @@ -24,19 +23,13 @@ ALL_LINGUAS="nl" dnl Checks for programs. AC_PROG_CC AC_PROG_CPP -AC_PROG_GCC_TRADITIONAL -AC_PROG_AWK AC_PROG_INSTALL AC_PROG_LN_S -AC_PROG_MAKE_SET -jm_PERL - - -AC_ISC_POSIX +AC_PROG_RANLIB dnl Check and set OS -AC_CANONICAL_HOST +#AC_CANONICAL_HOST case $host_os in *linux*) @@ -45,11 +38,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,16 +50,26 @@ 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]) [ 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; cp -f src/mingw/device.c src/device.c ] + LIBS="$LIBS -lws2_32" + ;; *) AC_MSG_ERROR("Unknown operating system.") ;; @@ -84,54 +87,43 @@ 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([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([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/if_types.h linux/if_tun.h net/if_tun.h net/if_tap.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_CACHE_CHECK([for socklen_t], ac_cv_type_socklen_t, -[ - AC_TRY_COMPILE( - [#include - #include ], - [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 +tinc_ATTRIBUTE(__malloc__) -AC_CACHE_CHECK([for struct addrinfo], ac_cv_struct_addrinfo, -[ - AC_TRY_COMPILE( - [#include - #include - #include ], - [struct addrinfo ai; ai.ai_family = AF_INET; return ai.ai_family;], - ac_cv_struct_addrinfo=yes, - ac_cv_struct_addrinfo=no) -]) -if test $ac_cv_struct_addrinfo = yes; then - AC_DEFINE(HAVE_STRUCT_ADDRINFO, 1, [struct addrinfo available]) -fi +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 get_current_dir_name \ -putenv select strdup strerror strsignal strtol unsetenv \ -freeaddrinfo gai_strerror getaddrinfo getnameinfo]) -jm_FUNC_MALLOC -jm_FUNC_REALLOC +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"] +) +AC_FUNC_MALLOC +AC_FUNC_REALLOC dnl Support for SunOS @@ -142,32 +134,32 @@ AC_CHECK_FUNC(gethostbyname, [], [ AC_CHECK_LIB(nsl, gethostbyname) ]) +AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo inet_aton], + [], [], [#include "have.h"] +) + AC_CACHE_SAVE dnl These are defined in files in m4/ -tinc_TUNTAP + 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)], + 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, - [ --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 po/Makefile.in -src/Makefile -doc/Makefile -doc/es/Makefile -lib/Makefile -m4/Makefile -po/Makefile.in -) +AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile lib/Makefile po/Makefile.in m4/Makefile]) + +AC_OUTPUT