X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=241390cb6a6db9d2d8f4ed0cedb199bbcfe90eb1;hp=d410162462428cf398a9078c0f8c99819a266475;hb=c549c705f8856bec29760614bd507e53c2e2a97f;hpb=6156b4779584b4bf1dc973ce988a34a1bcae1db3 diff --git a/configure.ac b/configure.ac index d41016246..241390cb6 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_PREREQ([2.64]) AC_INIT([elogind], - [226.2], + [228.3], [https://github.com/elogind/elogind/issues], [elogind], [https://github.com/elogind/elogind]) @@ -59,7 +59,7 @@ SET_ARCH(IA32, i*86*) SET_ARCH(MIPS, mips*) SET_ARCH(AARCH64, aarch64*) -# i18n stuff for the PolicyKit policy files, heck whether intltool can be found, disable NLS otherwise +# i18n stuff for the PolicyKit policy files, check whether intltool can be found, disable NLS otherwise AC_CHECK_PROG(intltool_found, [intltool-merge], [yes], [no]) AS_IF([test x"$intltool_found" != xyes], [AS_IF([test x"$enable_nls" = xyes], @@ -113,10 +113,17 @@ fi # ------------------------------------------------------------------------------ # Find running cgroup controller with_cgroupctrl= -AS_IF( [test -f /proc/self/cgroup], - [with_cgroupctrl=`grep "^1:name=" /proc/self/cgroup | cut -d ':' -f 2`]) +AS_IF( [test -f /proc/self/cgroup], [ + # If the init system is a cgroup controler, it will be position 1. + # Secondary controllers, like cgmanager, do not work. + with_cgroupctrl=`grep "^1:name=" /proc/self/cgroup | cut -d ':' -f 2` + AS_IF( [test -z "$with_cgroupctrl"], [ + # Try to be our own cgroup controller + with_cgroupctrl="name=elogind" + ]) +]) AS_IF( [test -z "$with_cgroupctrl"], - [with_cgroupctrl="name=elogind"]) + AC_MSG_ERROR([No running cgroup controller found])) # ------------------------------------------------------------------------------ @@ -168,7 +175,6 @@ CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ -Werror=implicit-function-declaration \ -Werror=missing-declarations \ -Werror=return-type \ - -Werror=shadow \ -Wstrict-prototypes \ -Wredundant-decls \ -Wmissing-noreturn \ @@ -193,18 +199,42 @@ CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ -fPIE \ --param=ssp-buffer-size=4]) +CC_CHECK_FLAG_APPEND([with_cflags], [CFLAGS], [-Werror=shadow], [ +#include +#include +typedef uint64_t usec_t; +usec_t now(clockid_t clock); +int main(void) { + struct timespec now; + return 0; +} +]) + AS_CASE([$CC], [*clang*], [CC_CHECK_FLAGS_APPEND([with_cppflags], [CPPFLAGS], [\ -Wno-typedef-redefinition \ -Wno-gnu-variable-sized-type-not-at-end \ ])]) -dnl AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*], -dnl [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ -dnl -flto])], -dnl [AC_MSG_RESULT([skipping -flto, optimization not enabled])]) -dnl AC_SUBST([OUR_CFLAGS], "$with_cflags $sanitizer_cflags") +# ------------------------------------------------------------------------------ +# On some distributions -flto, even if available, leads to linking errors. +# We therefore make it optional +have_lto=no +AC_ARG_ENABLE([lto], + [AS_HELP_STRING([--disable-lto], [Disable link time optimization (default: test)])]) + +AS_IF([test "x$enable_lto" != "xno"], [ + AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*], + [have_lto=yes], + [AC_MSG_RESULT([skipping -flto, optimization not enabled])]) + AS_IF([test "$have_lto" != "no"], + [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [-flto])] + ) + AC_SUBST([OUR_CFLAGS], "$with_cflags $sanitizer_cflags") +]) + +# ------------------------------------------------------------------------------ AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*], [CC_CHECK_FLAGS_APPEND([with_cppflags], [CPPFLAGS], [\ -Wp,-D_FORTIFY_SOURCE=2])], @@ -289,13 +319,11 @@ AS_IF([test "$have_python" != "yes"], [ AS_IF([test "$with_python" != "no"], [AC_MSG_WARN([*** python support not found, some documentation cannot be built])]) ]) - AM_CONDITIONAL([HAVE_PYTHON], [test "x$have_python" = "xyes"]) # ------------------------------------------------------------------------------ AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers not found])]) -AC_CHECK_HEADERS([linux/btrfs.h], [], []) AC_CHECK_HEADERS([linux/memfd.h], [], []) AC_CHECK_HEADERS([printf.h], [have_printf_h=yes], [have_printf_h=no]) @@ -309,20 +337,11 @@ AS_IF([test x$have_printf_h = xyes], [ dnl AC_SEARCH_LIBS([clock_gettime], [rt], [], []) dnl AC_SEARCH_LIBS([mq_unlink], [rt], [], []) -AC_ARG_WITH([libcap], - AS_HELP_STRING([--with-libcap=DIR], [Prefix for libcap]), - [CAP_LDFLAGS="-L$with_libcap/lib"], - [CAP_LDFLAGS=""]) save_LIBS="$LIBS" -save_LDFLAGS="$LDFLAGS" LIBS= -LDFLAGS="$LDFLAGS $CAP_LDFLAGS" AC_SEARCH_LIBS([cap_init], [cap], [], [AC_MSG_ERROR([*** POSIX caps library not found])]) CAP_LIBS="$LIBS" AC_SUBST(CAP_LIBS) -AC_SUBST(CAP_LDFLAGS) -LIBS="$save_LIBS" -LDFLAGS="$save_LDFLAGS" AC_CHECK_FUNCS([memfd_create]) AC_CHECK_FUNCS([__secure_getenv secure_getenv]) @@ -345,11 +364,11 @@ AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE, IFLA_BOND_AD_INFO, IFLA_VLAN_PROTOCOL, IFLA_VXLAN_REMCSUM_NOPARTIAL, - IFLA_VXLAN_LOCAL6, IFLA_IPTUN_ENCAP_DPORT, IFLA_GRE_ENCAP_DPORT, IFLA_BRIDGE_VLAN_INFO, IFLA_BRPORT_LEARNING_SYNC, + IFLA_BR_PRIORITY, NDA_IFINDEX, IFA_FLAGS], [], [], [[ @@ -515,12 +534,17 @@ if test "x${have_smack}" = xauto; then have_smack=yes fi +have_smack_run_label=no AC_ARG_WITH(smack-run-label, AS_HELP_STRING([--with-smack-run-label=STRING], - [run elogind --system itself with a specific SMACK label]), - [AC_DEFINE_UNQUOTED(SMACK_RUN_LABEL, ["$withval"], [Run elogind itself with SMACK label])], + [run systemd --system itself with a specific SMACK label]), + [AC_DEFINE_UNQUOTED(SMACK_RUN_LABEL, ["$withval"], [Run systemd itself with SMACK label]) have_smack_run_label=yes], []) +if test "x${have_smack_run_label}" = xyes; then + M4_DEFINES="$M4_DEFINES -DHAVE_SMACK_RUN_LABEL" +fi + AC_ARG_WITH(smack-default-process-label, AS_HELP_STRING([--with-smack-default-process-label=STRING], [default SMACK label for executed processes]), @@ -575,11 +599,6 @@ AM_CONDITIONAL(ENABLE_KDBUS, [test "$have_kdbus" = "yes"]) # ------------------------------------------------------------------------------ AC_CHECK_HEADERS_ONCE([valgrind/memcheck.h valgrind/valgrind.h]) -# ------------------------------------------------------------------------------ -PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 gio-2.0], - [have_glib=yes], [have_glib=no]) -AS_IF([test "x$have_glib" = "xyes"], [ AC_DEFINE(HAVE_GLIB, 1, [Define if glib is available]) ]) - # ------------------------------------------------------------------------------ have_manpages=no AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages])) @@ -738,6 +757,7 @@ AC_MSG_RESULT([ man pages: ${have_manpages} test coverage: ${have_coverage} Split /usr: ${enable_split_usr} + Link time optimization: ${have_lto} extra debugging: ${enable_debug} cgroup controller: ${with_cgroupctrl}