X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=16cb509067e55cea727c2105ebac4d7512f3b920;hp=24f4d0dd69963610d5c018a8a346dd28d3cc1584;hb=7b6ffe6395e164016636530c2aedaf3f4f9a7830;hpb=947a6c107a40f43b64adb3736a495e47caad7414 diff --git a/configure.ac b/configure.ac index 24f4d0dd6..16cb50906 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_PREREQ([2.64]) AC_INIT([elogind], - [226], + [229.1], [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], @@ -109,6 +109,23 @@ if test -z "$GPERF" ; then AC_MSG_ERROR([*** gperf not found]) fi + +# ------------------------------------------------------------------------------ +# Find running cgroup controller +with_cgroupctrl= +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"], + AC_MSG_ERROR([No running cgroup controller found])) + + # ------------------------------------------------------------------------------ address_sanitizer_cflags= address_sanitizer_cppflags= @@ -158,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 \ @@ -183,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])], @@ -233,7 +273,8 @@ AC_CHECK_SIZEOF(rlim_t,,[ ]) GPERF_TEST="$(echo foo,bar | ${GPERF} -L ANSI-C)" - +save_CFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -Wno-error" AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([ #include @@ -251,6 +292,7 @@ AC_COMPILE_IFELSE( [AC_MSG_ERROR([** unable to determine gperf len type])] )] ) +CFLAGS="$save_CFLAGS" AC_DEFINE_UNQUOTED([GPERF_LEN_TYPE], [$GPERF_LEN_TYPE], [gperf len type]) @@ -258,7 +300,7 @@ AC_DEFINE_UNQUOTED([GPERF_LEN_TYPE], [$GPERF_LEN_TYPE], [gperf len type]) # we use python to build the man page index have_python=no AC_ARG_WITH([python], - [AS_HELP_STRING([--without-python], [Disable building the man page index (default: test)])]) + [AS_HELP_STRING([--without-python], [Disable building the man page index and systemd-python (default: test)])]) have_lxml=no AS_IF([test "x$with_python" != "xno"], [ @@ -277,37 +319,34 @@ 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]) +AS_IF([test x$have_printf_h = xyes], [ + AC_DEFINE(HAVE_PRINTF_H, 1, [Define if printf.h was found]) +]) + + + # unconditionally pull-in librt with old glibc versions -AC_SEARCH_LIBS([clock_gettime], [rt], [], []) -AC_SEARCH_LIBS([mq_unlink], [rt], [], []) +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]) -AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, getrandom, renameat2, kcmp, LO_FLAGS_PARTSCAN], +AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, getrandom, renameat2, + char16_t, char32_t, LO_FLAGS_PARTSCAN], [], [], [[ #include #include @@ -326,11 +365,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], [], [], [[ @@ -350,16 +389,6 @@ AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE, # This makes sure pkg.m4 is available. m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config]) -# ------------------------------------------------------------------------------ -have_dbus=no -AC_ARG_ENABLE(dbus, AS_HELP_STRING([--disable-dbus], [disable usage of dbus-1 in tests])) -AS_IF([test "x$enable_dbus" != "xno"], [ - PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.3.2], - [AC_DEFINE(HAVE_DBUS, 1, [Define if dbus-1 library is available]) have_dbus=yes], - [have_dbus=no]) - AS_IF([test "x$have_dbus" = "xno" -a "x$enable_dbus" = "xyes"], - [AC_MSG_ERROR([*** dbus-1 support requested but libraries not found])])]) -AM_CONDITIONAL(HAVE_DBUS, [test "$have_dbus" = "yes"]) # ------------------------------------------------------------------------------ PKG_CHECK_MODULES(UDEV, [libudev]) @@ -399,33 +428,6 @@ if test "x$enable_coverage" = "xyes" ; then fi AM_CONDITIONAL(ENABLE_COVERAGE, [test "$have_coverage" = "yes"]) -# ------------------------------------------------------------------------------ -have_blkid=no -AC_ARG_ENABLE(blkid, AS_HELP_STRING([--disable-blkid], [disable blkid support])) -if test "x$enable_blkid" != "xno"; then - PKG_CHECK_MODULES(BLKID, [ blkid >= 2.24 ], - [AC_DEFINE(HAVE_BLKID, 1, [Define if blkid is available]) have_blkid=yes], have_blkid=no) - if test "x$have_blkid" = xno -a "x$enable_blkid" = xyes; then - AC_MSG_ERROR([*** blkid support requested but libraries not found]) - fi -fi -AM_CONDITIONAL(HAVE_BLKID, [test "$have_blkid" = "yes"]) - -# ------------------------------------------------------------------------------ -have_seccomp=no -AC_ARG_ENABLE(seccomp, AS_HELP_STRING([--disable-seccomp], [Disable optional SECCOMP support])) -if test "x$enable_seccomp" != "xno"; then - PKG_CHECK_MODULES(SECCOMP, [libseccomp >= 1.0.0], - [AC_DEFINE(HAVE_SECCOMP, 1, [Define if seccomp is available]) - have_seccomp=yes - M4_DEFINES="$M4_DEFINES -DHAVE_SECCOMP"], - [have_seccomp=no]) - if test "x$have_seccomp" = "xno" -a "x$enable_seccomp" = "xyes"; then - AC_MSG_ERROR([*** seccomp support requested but libraries not found]) - fi -fi -AM_CONDITIONAL(HAVE_SECCOMP, [test "$have_seccomp" = "yes"]) - # ------------------------------------------------------------------------------ have_selinux=no AC_ARG_ENABLE(selinux, AS_HELP_STRING([--disable-selinux], [Disable optional SELINUX support])) @@ -441,20 +443,6 @@ if test "x$enable_selinux" != "xno"; then fi AM_CONDITIONAL(HAVE_SELINUX, [test "$have_selinux" = "yes"]) -have_apparmor=no -AC_ARG_ENABLE(apparmor, AS_HELP_STRING([--disable-apparmor], [Disable optional AppArmor support])) -if test "x$enable_apparmor" != "xno"; then - PKG_CHECK_MODULES([APPARMOR], [libapparmor], - [AC_DEFINE(HAVE_APPARMOR, 1, [Define if AppArmor is available]) - have_apparmor=yes - M4_DEFINES="$M4_DEFINES -DHAVE_APPARMOR"], - [have_apparmor=no]) - if test "x$have_apparmor" = xno -a "x$enable_apparmor" = xyes; then - AC_MSG_ERROR([*** AppArmor support requested but libraries not found]) - fi -fi -AM_CONDITIONAL(HAVE_APPARMOR, [test "$have_apparmor" = "yes"]) - # ------------------------------------------------------------------------------ AC_ARG_ENABLE([pam], AS_HELP_STRING([--disable-pam],[Disable optional PAM support]), @@ -542,38 +530,31 @@ AC_ARG_ENABLE([smack], AS_HELP_STRING([--disable-smack],[Disable optional SMACK esac], [have_smack=auto]) -if test "x${have_smack}" = xauto; then +if test "x${have_smack}" != xno; then + AC_DEFINE(HAVE_SMACK, 1, [Define if SMACK is available]) M4_DEFINES="$M4_DEFINES -DHAVE_SMACK" have_smack=yes fi +AM_CONDITIONAL([HAVE_SMACK], [test "x$have_smack" = "xyes"]) + +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]), [AC_DEFINE_UNQUOTED(SMACK_DEFAULT_PROCESS_LABEL, ["$withval"], [Default SMACK label for executed processes])], []) -if test "x${have_smack}" = xyes ; then - AC_DEFINE(HAVE_SMACK, 1, [Define if SMACK is available]) -fi - -AM_CONDITIONAL([HAVE_SMACK], [test "x$have_smack" = "xyes"]) - -# ------------------------------------------------------------------------------ -have_logind=yes -#AC_ARG_ENABLE(logind, AS_HELP_STRING([--disable-logind], [disable login daemon])) -#if test "x$enable_logind" != "xno"; then -# have_logind=yes -#fi -AM_CONDITIONAL(ENABLE_LOGIND, [test "$have_logind" = "yes"]) -AS_IF([test "$have_logind" = "yes"], [ AC_DEFINE(HAVE_LOGIND, [1], [Logind support available]) ]) - # ------------------------------------------------------------------------------ AC_ARG_WITH(system-uid-max, AS_HELP_STRING([--with-system-uid-max=UID] @@ -616,14 +597,10 @@ 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])) +AC_PATH_PROG([XSLTPROC], [xsltproc]) AS_IF([test "x$enable_manpages" != xno], [have_manpages=yes]) AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"]) @@ -714,14 +691,17 @@ AC_ARG_ENABLE(tests, AM_CONDITIONAL(ENABLE_TESTS, [test x$enable_tests = xyes]) AC_ARG_ENABLE(debug, - [AC_HELP_STRING([--enable-debug@<:@=LIST@:>@], [enable extra debugging (hashmap,mmap-cache)])], + [AC_HELP_STRING([--enable-debug@<:@=LIST@:>@], [enable extra debugging (elogind,hashmap,mmap-cache)])], [if test "x$enableval" = "xyes"; then - enableval="hashmap,mmap-cache" + enableval="elogind,hashmap,mmap-cache" fi saved_ifs="$IFS" IFS="$IFS$PATH_SEPARATOR," for name in $enableval; do case $name in + elogind) + enable_debug_elogind=yes + ;; hashmap) enable_debug_hashmap=yes ;; @@ -733,6 +713,10 @@ AC_ARG_ENABLE(debug, IFS="$saved_ifs"],[]) enable_debug="" +AS_IF([test x$enable_debug_elogind = xyes], [ + AC_DEFINE(ENABLE_DEBUG_ELOGIND, 1, [Define if elogind debugging is to be enabled]) + enable_debug="elogind $enable_debug" +]) AS_IF([test x$enable_debug_hashmap = xyes], [ AC_DEFINE(ENABLE_DEBUG_HASHMAP, 1, [Define if hashmap debugging is to be enabled]) enable_debug="hashmap $enable_debug" @@ -751,6 +735,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir]) AC_SUBST([pamconfdir], [$with_pamconfdir]) AC_SUBST([rootprefix], [$with_rootprefix]) AC_SUBST([rootlibdir], [$with_rootlibdir]) +AC_SUBST([cgroup_controller], [$with_cgroupctrl]) AC_CONFIG_FILES([ Makefile @@ -762,20 +747,18 @@ AC_MSG_RESULT([ $PACKAGE_NAME $VERSION PAM: ${have_pam} - AppArmor: ${have_apparmor} SELinux: ${have_selinux} - SECCOMP: ${have_seccomp} SMACK: ${have_smack} ACL: ${have_acl} polkit: ${have_polkit} - blkid: ${have_blkid} - dbus: ${have_dbus} kdbus: ${have_kdbus} Python: ${have_python} 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} prefix: ${prefix} rootprefix: ${with_rootprefix}