X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=configure.ac;h=89087da5a44d6eb3ca80af382b263658bf3d2215;hb=50afa82a8f14ead7d4d3eafd2a1347b3bb9a2879;hp=ad5ba622301d909cdd379b3c6ec8fda999d914d9;hpb=3cceae93f61a44d4f9f38d729555b2f31e209beb;p=tinc diff --git a/configure.ac b/configure.ac index ad5ba622..89087da5 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) AC_INIT([tinc], m4_esyscmd_s((git describe || echo UNKNOWN) | sed 's/release-//')) AC_CONFIG_SRCDIR([src/tincd.c]) -AC_GNU_SOURCE -AM_INIT_AUTOMAKE([std-options subdir-objects nostdinc silent-rules -Wall]) +AM_INIT_AUTOMAKE([std-options subdir-objects nostdinc silent-rules -Wall info-in-builddir]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) AM_SILENT_RULES([yes]) @@ -19,7 +18,6 @@ dnl Checks for programs. AC_PROG_CC_C99 AC_PROG_CPP AC_PROG_INSTALL -AC_PROG_LN_S AM_PROG_CC_C_O @@ -140,6 +138,8 @@ AS_IF([test -d /sw/lib], [LIBS="$LIBS -L/sw/lib"]) dnl Compiler hardening flags dnl No -fstack-protector-all because it doesn't work on all platforms or architectures. +AX_CFLAGS_WARN_ALL(CFLAGS) + AC_ARG_ENABLE([hardening], AS_HELP_STRING([--disable-hardening], [disable compiler and linker hardening flags])) AS_IF([test "x$enable_hardening" != "xno"], [AX_CHECK_COMPILE_FLAG([-DFORTIFY_SOURCE=2], [CPPFLAGS="$CPPFLAGS -DFORTIFY_SOURCE=2"]) @@ -184,7 +184,7 @@ AC_CHECK_TYPES([struct ether_header, struct arphdr, struct ether_arp, struct ip, dnl Checks for library functions. AC_TYPE_SIGNAL -AC_CHECK_FUNCS([asprintf daemon fchmod flock ftime fork gettimeofday mlockall putenv recvmmsg strsignal nanosleep unsetenv vsyslog devname fdevname], +AC_CHECK_FUNCS([asprintf daemon fchmod flock fork gettimeofday mlockall putenv recvmmsg strsignal nanosleep unsetenv vsyslog devname fdevname], [], [], [#include "$srcdir/src/have.h"] ) @@ -203,7 +203,7 @@ case $host_os in [], [AC_MSG_ERROR([Required header file missng])], [#include "$srcdir/src/have.h"] ) ;; - *bsd*|*darwin*) + *bsd*|*dragonfly*|*darwin*) AC_CHECK_HEADERS([net/if_tun.h net/if_utun.h net/tun/if_tun.h net/if_tap.h net/tap/if_tap.h], [], [], [#include "$srcdir/src/have.h"] ) @@ -255,6 +255,11 @@ AC_ARG_ENABLE(jumbograms, ] ) +dnl Ensure runstatedir is set if we are using a version of autoconf that does not suppport it +if test "x$runstatedir" = "x"; then + AC_SUBST([runstatedir], ['${localstatedir}/run']) +fi + AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile gui/Makefile test/Makefile systemd/Makefile]) AC_OUTPUT