projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ensure we call CloseServiceHandle() in case of errors.
[tinc]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
1a032e6
..
216f271
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,10
+1,11
@@
dnl Process this file with autoconf to produce a configure script.
dnl Process this file with autoconf to produce a configure script.
+origcflags="$CFLAGS"
+
AC_PREREQ(2.61)
AC_INIT([tinc], m4_esyscmd_s((git describe || echo UNKNOWN) | sed 's/release-//'))
AC_CONFIG_SRCDIR([src/tincd.c])
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])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
AM_SILENT_RULES([yes])
@@
-19,10
+20,12
@@
dnl Checks for programs.
AC_PROG_CC_C99
AC_PROG_CPP
AC_PROG_INSTALL
AC_PROG_CC_C99
AC_PROG_CPP
AC_PROG_INSTALL
-AC_PROG_LN_S
-
AM_PROG_CC_C_O
AM_PROG_CC_C_O
+dnl Check whether to enable code coverage testing, and if so, clear the default CFLAGS.
+AX_CODE_COVERAGE
+AS_IF([test "x$enable_code_coverage" = "xyes" -a "x$origcflags" = "x"], [CFLAGS=""])
+
dnl Check and set OS
AC_CANONICAL_HOST
dnl Check and set OS
AC_CANONICAL_HOST
@@
-117,7
+120,7
@@
AC_ARG_WITH(systemd,
[ systemd=false ]
)
[ systemd=false ]
)
-AS_IF([test "x$with_systemd" = "xyes"], [systemd_path="
/lib
/systemd/system"],
+AS_IF([test "x$with_systemd" = "xyes"], [systemd_path="
\${libdir}
/systemd/system"],
[AS_IF([test "x$with_systemd" = "xno"], [systemd=false])])
AC_SUBST(systemd_path, $systemd_path)
[AS_IF([test "x$with_systemd" = "xno"], [systemd=false])])
AC_SUBST(systemd_path, $systemd_path)
@@
-186,7
+189,7
@@
AC_CHECK_TYPES([struct ether_header, struct arphdr, struct ether_arp, struct ip,
dnl Checks for library functions.
AC_TYPE_SIGNAL
dnl Checks for library functions.
AC_TYPE_SIGNAL
-AC_CHECK_FUNCS([asprintf daemon fchmod flock f
time f
ork 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"]
)
[], [], [#include "$srcdir/src/have.h"]
)
@@
-257,6
+260,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
AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile gui/Makefile test/Makefile systemd/Makefile])
AC_OUTPUT