X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=256a27c76308f3ec761863a2a99e525b02c83060;hp=2348dac6ea3f7c7bfe2b6676402d543d319d10d0;hb=1e1951d43e06abd0b45b068febe9e390b9a10cdc;hpb=7115e487cd1881ae4934317ac5f91ee11d5e1a75 diff --git a/configure.ac b/configure.ac index 2348dac6e..256a27c76 100644 --- a/configure.ac +++ b/configure.ac @@ -19,13 +19,14 @@ AC_PREREQ([2.64]) -AC_INIT([systemd], - [218], - [http://bugs.freedesktop.org/enter_bug.cgi?product=systemd], - [systemd], - [http://www.freedesktop.org/wiki/Software/systemd]) - -AC_CONFIG_SRCDIR([src/core/main.c]) +# FIXME: Update to proper web page +AC_INIT([elogind], + [219], + [http://bugs.freedesktop.org/enter_bug.cgi?product=elogind], + [elogind], + [http://www.freedesktop.org/wiki/Software/elogind]) + +AC_CONFIG_SRCDIR([src/login/logind.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([build-aux]) @@ -34,23 +35,21 @@ AC_USE_SYSTEM_EXTENSIONS AC_SYS_LARGEFILE AC_PREFIX_DEFAULT([/usr]) AM_MAINTAINER_MODE([enable]) -AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax no-dist-gzip dist-xz subdir-objects]) +AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax no-dist-gzip dist-xz subdir-objects parallel-tests]) AM_SILENT_RULES([yes]) AC_CANONICAL_HOST AC_DEFINE_UNQUOTED([CANONICAL_HOST], "$host", [Canonical host string.]) -AS_IF([test "x$host_cpu" = "xmips" || test "x$host_cpu" = "xmipsel" || - test "x$host_cpu" = "xmips64" || test "x$host_cpu" = "xmips64el"], - [AC_DEFINE(ARCH_MIPS, [], [Whether on mips arch])]) - LT_PREREQ(2.2) LT_INIT([disable-static]) -AS_IF([test "x$enable_static" = "xyes"], [AC_MSG_ERROR([--enable-static is not supported by systemd])]) -AS_IF([test "x$enable_largefile" = "xno"], [AC_MSG_ERROR([--disable-largefile is not supported by systemd])]) +AS_IF([test "x$enable_static" = "xyes"], [AC_MSG_ERROR([--enable-static is not supported by elogind])]) +AS_IF([test "x$enable_largefile" = "xno"], [AC_MSG_ERROR([--disable-largefile is not supported by elogind])]) -# i18n stuff for the PolicyKit policy files +SET_ARCH(X86_64, x86_64*) +SET_ARCH(IA32, i*86*) +SET_ARCH(MIPS, mips*) -# Check whether intltool can be found, disable NLS otherwise +# i18n stuff for the PolicyKit policy files, heck 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], @@ -73,8 +72,9 @@ AS_IF([test -z "$INTLTOOL_POLICY_RULE"], [ AC_SUBST(INTLTOOL_POLICY_RULE) ]) -GETTEXT_PACKAGE=systemd +GETTEXT_PACKAGE=elogind AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [elogind]) AC_PROG_MKDIR_P AC_PROG_LN_S @@ -87,9 +87,6 @@ AC_PROG_CC_C99 AC_PATH_PROG([M4], [m4]) AC_PATH_PROG([XSLTPROC], [xsltproc]) -AC_PATH_PROG([QUOTAON], [quotaon], [/usr/sbin/quotaon], [$PATH:/usr/sbin:/sbin]) -AC_PATH_PROG([QUOTACHECK], [quotacheck], [/usr/sbin/quotacheck], [$PATH:/usr/sbin:/sbin]) - AC_PATH_PROG([SETCAP], [setcap], [/usr/sbin/setcap], [$PATH:/usr/sbin:/sbin]) AC_PATH_PROG([KILL], [kill], [/usr/bin/kill], [$PATH:/usr/sbin:/sbin]) @@ -98,6 +95,8 @@ AC_PATH_PROG([KMOD], [kmod], [/usr/bin/kmod], [$PATH:/usr/sbin:/sbin]) AC_PATH_PROG([KEXEC], [kexec], [/usr/sbin/kexec], [$PATH:/usr/sbin:/sbin]) +AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin]) + AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])]) M4_DEFINES= @@ -185,6 +184,7 @@ CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ -Wno-unused-parameter \ -Wno-missing-field-initializers \ -Wno-unused-result \ + -Wno-format-signedness \ -Werror=overflow \ -Wdate-time \ -Wnested-externs \ @@ -206,13 +206,13 @@ AS_CASE([$CC], [*clang*], -Wno-gnu-variable-sized-type-not-at-end \ ])]) -AS_CASE([$CFLAGS], [*-O[[12345\ ]]*], +AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*], [CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ -flto -ffat-lto-objects])], [AC_MSG_RESULT([skipping -flto, optimization not enabled])]) AC_SUBST([OUR_CFLAGS], "$with_cflags $sanitizer_cflags") -AS_CASE([$CFLAGS], [*-O[[12345\ ]]*], +AS_CASE([$CFLAGS], [*-O[[12345sz\ ]]*], [CC_CHECK_FLAGS_APPEND([with_cppflags], [CPPFLAGS], [\ -Wp,-D_FORTIFY_SOURCE=2])], [AC_MSG_RESULT([skipping -D_FORTIFY_SOURCE, optimization not enabled])]) @@ -238,54 +238,6 @@ AC_CHECK_SIZEOF(rlim_t,,[ #include ]) -# ------------------------------------------------------------------------------ -# we use python to build the man page index, and for systemd-python -have_python=no -AC_ARG_WITH([python], - [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"], [ - AM_PATH_PYTHON(,, [:]) - AS_IF([test "x$PYTHON" != "x:"], [ - AC_MSG_CHECKING([for python lxml module]) - AS_IF(["$PYTHON" -c 'import lxml' 2>/dev/null], [have_lxml=yes]) - AC_MSG_RESULT([$have_lxml]) - AS_IF([test "x$have_lxml" = "xyes"], [have_python=yes], - [AC_MSG_WARN([*** python support requires python-lxml module installed])]) - ]) -]) -AS_IF([test "$have_python" != "yes"], [ - AS_IF([test "$with_python" = "yes"], - [AC_MSG_ERROR([*** python support requested but python support not found])]) - 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"]) -AS_IF([test "x$PYTHON_BINARY" = "x"], - [AS_IF([test "x$have_python" = "xyes"], - [PYTHON_BINARY="$(which "$PYTHON")"], - [PYTHON_BINARY=/usr/bin/python])]) -AC_ARG_VAR(PYTHON_BINARY, [Python binary used to launch installed scripts]) - -AS_IF([test "x$have_python" != "xyes" -a "x$enable_python_devel" = "xyes"], - [AC_MSG_ERROR([*** python-devel support requires --with-python])]) - -have_python_devel=no -AC_ARG_ENABLE(python_devel, AS_HELP_STRING([--disable-python-devel], [Do not build python modules])) -AS_IF([test "x$have_python" = "xyes" -a "x$enable_python_devel" != "xno"], [ - PKG_CHECK_MODULES([PYTHON_DEVEL], [python-${PYTHON_VERSION}], - [have_python_devel=yes], - [PKG_CHECK_MODULES([PYTHON_DEVEL], [python], - [have_python_devel=yes], - [have_python_devel=no])]) - AS_IF([test "x$have_python_devel" = xno -a "x$enable_python_devel" = xyes], - [AC_MSG_ERROR([*** python-devel support requested but libraries not found])]) - AC_PATH_PROGS(SPHINX_BUILD, sphinx-build-${PYTHON_VERSION} sphinx-build) -]) -AM_CONDITIONAL([HAVE_PYTHON_DEVEL], [test "$have_python_devel" = "yes"]) - # ------------------------------------------------------------------------------ AC_SEARCH_LIBS([dlsym], [dl], [], [AC_MSG_ERROR([*** Dynamic linking loader library not found])]) @@ -310,7 +262,7 @@ LIBS="$save_LIBS" AC_CHECK_FUNCS([memfd_create]) AC_CHECK_FUNCS([__secure_getenv secure_getenv]) -AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, getrandom, LO_FLAGS_PARTSCAN], +AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, getrandom, renameat2, kcmp, LO_FLAGS_PARTSCAN], [], [], [[ #include #include @@ -321,7 +273,9 @@ AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, getrandom, LO_FLAG #include ]]) -AC_CHECK_DECLS([IFLA_MACVLAN_FLAGS, +AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE, + IFLA_MACVLAN_FLAGS, + IFLA_IPVLAN_MODE, IFLA_VTI_REMOTE, IFLA_PHYS_PORT_ID, IFLA_BOND_AD_INFO, @@ -329,7 +283,8 @@ AC_CHECK_DECLS([IFLA_MACVLAN_FLAGS, IFLA_VXLAN_LOCAL6, IFLA_IPTUN_6RD_RELAY_PREFIXLEN, IFLA_BRIDGE_VLAN_INFO, - IFLA_BRPORT_UNICAST_FLOOD], + IFLA_BRPORT_UNICAST_FLOOD, + NDA_IFINDEX], [], [], [[ #include #include @@ -340,6 +295,7 @@ AC_CHECK_DECLS([IFLA_MACVLAN_FLAGS, #include #include #include +#include ]]) # This makes sure pkg.m4 is available. @@ -357,14 +313,7 @@ AS_IF([test "x$enable_dbus" != "xno"], [ AM_CONDITIONAL(HAVE_DBUS, [test "$have_dbus" = "yes"]) # ------------------------------------------------------------------------------ -have_utmp=yes -AC_ARG_ENABLE([utmp], AS_HELP_STRING([--disable-utmp], [disable utmp/wtmp log handling]), - AS_CASE("x${enableval}", - [xyes], [have_utmp=yes], - [xno], [have_utmp=no], - AC_MSG_ERROR(bad value ${enableval} for --enable-utmp))) -AS_IF([test "x$have_utmp" = "xyes"], [AC_DEFINE(HAVE_UTMP, 1, [Define if utmp/wtmp support is enabled])]) -AM_CONDITIONAL([HAVE_UTMP], [test "x$have_utmp" = "xyes"]) +PKG_CHECK_MODULES(UDEV, [libudev]) # ------------------------------------------------------------------------------ have_compat_libs=no @@ -440,15 +389,6 @@ if test "x$enable_blkid" != "xno"; then fi AM_CONDITIONAL(HAVE_BLKID, [test "$have_blkid" = "yes"]) -# ------------------------------------------------------------------------------ -have_libmount=no -PKG_CHECK_MODULES(MOUNT, [ mount >= 2.20 ], - [AC_DEFINE(HAVE_LIBMOUNT, 1, [Define if libmount is available]) have_libmount=yes], have_libmount=no) -if test "x$have_libmount" = xno; then - AC_MSG_ERROR([*** libmount support required but libraries not found]) -fi -AM_CONDITIONAL(HAVE_LIBMOUNT, [test "$have_libmount" = "yes"]) - # ------------------------------------------------------------------------------ have_seccomp=no AC_ARG_ENABLE(seccomp, AS_HELP_STRING([--disable-seccomp], [Disable optional SECCOMP support])) @@ -556,17 +496,41 @@ have_xz=no AC_ARG_ENABLE(xz, AS_HELP_STRING([--disable-xz], [Disable optional XZ support])) if test "x$enable_xz" != "xno"; then PKG_CHECK_MODULES(XZ, [ liblzma ], - [AC_DEFINE(HAVE_XZ, 1, [Define if XZ is available]) have_xz=yes]) + [AC_DEFINE(HAVE_XZ, 1, [Define if XZ is available]) have_xz=yes], have_xz=no) if test "x$have_xz" = xno -a "x$enable_xz" = xyes; then AC_MSG_ERROR([*** XZ support requested but libraries not found]) fi fi AM_CONDITIONAL(HAVE_XZ, [test "$have_xz" = "yes"]) +# ------------------------------------------------------------------------------ +have_zlib=no +AC_ARG_ENABLE(zlib, AS_HELP_STRING([--disable-zlib], [Disable optional ZLIB support])) +if test "x$enable_zlib" != "xno"; then + PKG_CHECK_MODULES(ZLIB, [ zlib ], + [AC_DEFINE(HAVE_ZLIB, 1, [Define if ZLIB is available]) have_zlib=yes], have_zlib=no) + if test "x$have_zlib" = xno -a "x$enable_zlib" = xyes; then + AC_MSG_ERROR([*** ZLIB support requested but libraries not found]) + fi +fi +AM_CONDITIONAL(HAVE_ZLIB, [test "$have_zlib" = "yes"]) + +# ------------------------------------------------------------------------------ +have_bzip2=no +AC_ARG_ENABLE(bzip2, AS_HELP_STRING([--enable-bzip2], [Disable optional BZIP2 support])) +AS_IF([test "x$enable_bzip2" != "xno"], [ + AC_CHECK_HEADERS(bzlib.h, + [AC_DEFINE(HAVE_BZIP2, 1, [Define in BZIP2 is available]) + have_bzip2=yes], + [AS_IF([test "x$have_bzip2" = xyes], [AC_MSG_ERROR([*** BZIP2 support requested but headers not found])]) + ]) +]) +AM_CONDITIONAL(HAVE_BZIP2, [test "$have_bzip2" = "yes"]) + # ------------------------------------------------------------------------------ have_lz4=no AC_ARG_ENABLE(lz4, AS_HELP_STRING([--enable-lz4], [Enable optional LZ4 support])) -AS_IF([test "x$enable_lz4" == "xyes"], [ +AS_IF([test "x$enable_lz4" = "xyes"], [ AC_CHECK_HEADERS(lz4.h, [AC_DEFINE(HAVE_LZ4, 1, [Define in LZ4 is available]) have_lz4=yes], [AC_MSG_ERROR([*** LZ4 support requested but headers not found])]) @@ -643,6 +607,7 @@ if test "x${have_acl}" != xno ; then if test "x$have_acl" = xyes ; then ACL_LIBS="-lacl" AC_DEFINE(HAVE_ACL, 1, [ACL available]) + M4_DEFINES="$M4_DEFINES -DHAVE_ACL" else have_acl=no fi @@ -893,14 +858,6 @@ if test "x$enable_bootchart" != "xno"; then fi AM_CONDITIONAL(ENABLE_BOOTCHART, [test "$have_bootchart" = "yes"]) -# ------------------------------------------------------------------------------ -have_quotacheck=no -AC_ARG_ENABLE(quotacheck, AS_HELP_STRING([--disable-quotacheck], [disable quotacheck tools])) -if test "x$enable_quotacheck" != "xno"; then - have_quotacheck=yes -fi -AM_CONDITIONAL(ENABLE_QUOTACHECK, [test "$have_quotacheck" = "yes"]) - # ------------------------------------------------------------------------------ have_tmpfiles=no AC_ARG_ENABLE(tmpfiles, AS_HELP_STRING([--disable-tmpfiles], [disable tmpfiles support])) @@ -967,6 +924,15 @@ fi AM_CONDITIONAL(ENABLE_MACHINED, [test "$have_machined" = "yes"]) AS_IF([test "$have_machined" = "yes"], [ AC_DEFINE(HAVE_MACHINED, [1], [Machined support available]) ]) +# ------------------------------------------------------------------------------ +have_importd=no +AC_ARG_ENABLE(importd, AS_HELP_STRING([--disable-importd], [disable import daemon])) +if test "x$enable_importd" != "xno"; then + have_importd=yes +fi +AM_CONDITIONAL(ENABLE_IMPORTD, [test "$have_importd" = "yes"]) +AS_IF([test "$have_importd" = "yes"], [ AC_DEFINE(HAVE_IMPORTD, [1], [Importd support available]) ]) + # ------------------------------------------------------------------------------ have_hostnamed=no AC_ARG_ENABLE(hostnamed, AS_HELP_STRING([--disable-hostnamed], [disable hostname daemon])) @@ -1092,16 +1058,82 @@ fi AM_CONDITIONAL(ENABLE_EFI, [test "x$have_efi" = "xyes"]) # ------------------------------------------------------------------------------ +EFI_CC=gcc +AC_SUBST([EFI_CC]) + +EFI_ARCH=`echo $host | sed "s/\(-\).*$//"` + +AM_COND_IF(ARCH_IA32, [ + EFI_ARCH=ia32 + EFI_MACHINE_TYPE_NAME=ia32]) + +AM_COND_IF(ARCH_X86_64, [ + EFI_MACHINE_TYPE_NAME=x64]) + +AC_SUBST([EFI_ARCH]) +AC_SUBST([EFI_MACHINE_TYPE_NAME]) + +have_gnuefi=no +AC_ARG_ENABLE(gnuefi, AS_HELP_STRING([--enable-gnuefi], [Disable optional gnuefi support])) +AS_IF([test "x$enable_gnuefi" != "xno"], [ + AC_CHECK_HEADERS(efi/${EFI_ARCH}/efibind.h, + [AC_DEFINE(HAVE_GNUEFI, 1, [Define if gnuefi is available]) + have_gnuefi=yes], + [AS_IF([test "x$enable_gnuefi" = xyes], + [AC_MSG_ERROR([*** gnuefi support requested but headers not found])]) + ]) + + efiroot=$(echo $(cd /usr/lib/$(gcc -print-multi-os-directory); pwd)) + + EFI_LIB_DIR="$efiroot" + AC_ARG_WITH(efi-libdir, + AS_HELP_STRING([--with-efi-libdir=PATH], [Path to EFI lib directory]), + [EFI_LIB_DIR="$withval"], [EFI_LIB_DIR="$efiroot"] + ) + AC_SUBST([EFI_LIB_DIR]) + + have_efi_lds=no + AC_ARG_WITH(efi-ldsdir, + AS_HELP_STRING([--with-efi-ldsdir=PATH], [Path to EFI lds directory]), + [EFI_LDS_DIR="$withval" && AC_CHECK_FILE([${EFI_LDS_DIR}/elf_${EFI_ARCH}_efi.lds], + [have_efi_lds=yes])], + [AS_FOR([DIR], [EFI_LDS_DIR], ["${efiroot}/gnuefi" "${efiroot}"], + [AC_CHECK_FILE([${EFI_LDS_DIR}/elf_${EFI_ARCH}_efi.lds], + [have_efi_lds=yes && break])])]) + AS_IF([test "x$have_efi_lds" = xyes], + [AC_SUBST([EFI_LDS_DIR])], + [AS_IF([test "x$enable_gnuefi" = xyes], + [AC_MSG_ERROR([*** gnuefi support requested but files not found])], + [have_gnuefi=no])]) + + AC_ARG_WITH(efi-includedir, + AS_HELP_STRING([--with-efi-includedir=PATH], [Path to EFI include directory]), + [EFI_INC_DIR="$withval"], [EFI_INC_DIR="/usr/include"] + ) + AC_SUBST([EFI_INC_DIR]) +]) +AM_CONDITIONAL(HAVE_GNUEFI, [test "x$have_gnuefi" = xyes]) + +# ------------------------------------------------------------------------------ +AC_ARG_WITH(unifont, + AS_HELP_STRING([--with-unifont=PATH], + [Path to unifont.hex]), + [UNIFONT="$withval"], + [UNIFONT="/usr/share/unifont/unifont.hex"]) +AC_SUBST(UNIFONT) + have_terminal=no +have_unifont=no AC_ARG_ENABLE(terminal, AS_HELP_STRING([--enable-terminal], [enable terminal support])) if test "x$enable_terminal" = "xyes"; then PKG_CHECK_MODULES([TERMINAL], [ libevdev >= 1.2 xkbcommon >= 0.5 libdrm >= 2.4], [have_terminal=yes]) - AS_IF([test "x$have_terminal" != xyes -a "x$enable_terminal" = xyes], + AC_CHECK_FILE($UNIFONT, [have_unifont=yes]) + AS_IF([test "x$have_terminal" != xyes -o "x$have_unifont" != "xyes" -a "x$enable_terminal" = xyes], [AC_MSG_ERROR([*** terminal support requested but required dependencies not available])], - [test "x$have_terminal" = xyes], + [test "x$have_terminal" = xyes -a "x$have_unifont" = "xyes"], [AC_DEFINE(ENABLE_TERMINAL, 1, [Define if terminal support is to be enabled])]) fi -AM_CONDITIONAL(ENABLE_TERMINAL, [test "x$have_terminal" = "xyes"]) +AM_CONDITIONAL(ENABLE_TERMINAL, [test "x$have_terminal" = "xyes" -a "x$have_unifont" = "xyes"]) # ------------------------------------------------------------------------------ have_kdbus=no @@ -1213,39 +1245,8 @@ AC_ARG_ENABLE(ldconfig, enable_ldconfig=$enableval, enable_ldconfig=yes) AM_CONDITIONAL(ENABLE_LDCONFIG, [test x$enable_ldconfig = xyes]) -# ------------------------------------------------------------------------------ -# Location of the init scripts as mandated by LSB -SYSTEM_SYSVINIT_PATH=/etc/init.d -SYSTEM_SYSVRCND_PATH=/etc/rc.d - -AC_ARG_WITH([sysvinit-path], - [AS_HELP_STRING([--with-sysvinit-path=PATH], - [Specify the path to where the SysV init scripts are located])], - [SYSTEM_SYSVINIT_PATH="$withval"], - []) - -AC_ARG_WITH([sysvrcnd-path], - [AS_HELP_STRING([--with-sysvrcnd-path=PATH], - [Specify the path to the base directory for the SysV rcN.d directories])], - [SYSTEM_SYSVRCND_PATH="$withval"], - []) - -if test "x${SYSTEM_SYSVINIT_PATH}" != "x" -a "x${SYSTEM_SYSVRCND_PATH}" != "x"; then - AC_DEFINE(HAVE_SYSV_COMPAT, [], [SysV init scripts and rcN.d links are supported.]) - SYSTEM_SYSV_COMPAT="yes" - M4_DEFINES="$M4_DEFINES -DHAVE_SYSV_COMPAT" -elif test "x${SYSTEM_SYSVINIT_PATH}" != "x" -o "x${SYSTEM_SYSVRCND_PATH}" != "x"; then - AC_MSG_ERROR([*** You need both --with-sysvinit-path=PATH and --with-sysvrcnd-path=PATH to enable SysV compatibility support, or both empty to disable it.]) -else - SYSTEM_SYSV_COMPAT="no" -fi - -AC_SUBST(SYSTEM_SYSVINIT_PATH) -AC_SUBST(SYSTEM_SYSVRCND_PATH) AC_SUBST(M4_DEFINES) -AM_CONDITIONAL(HAVE_SYSV_COMPAT, test "$SYSTEM_SYSV_COMPAT" = "yes") - AC_ARG_WITH([tty-gid], [AS_HELP_STRING([--with-tty-gid=GID], [Specify the numeric GID of the 'tty' group])], @@ -1330,6 +1331,14 @@ AS_IF([test "x$0" != "x./configure"], [ AC_SUBST([INTLTOOL_UPDATE], [/bin/true]) ]) +# QEMU and OVMF UEFI firmware +AS_IF([test x"$cross_compiling" = "xyes"], [], [ + AC_PATH_PROG([QEMU], [qemu-system-x86_64]) + AC_CHECK_FILE([/usr/share/qemu/bios-ovmf.bin], [QEMU_BIOS=/usr/share/qemu/bios-ovmf.bin], + [AC_CHECK_FILE([/usr/share/qemu-ovmf/bios.bin], [QEMU_BIOS=/usr/share/qemu-ovmf/bios.bin])]) + AC_SUBST([QEMU_BIOS]) +]) + AC_ARG_ENABLE(tests, [AC_HELP_STRING([--disable-tests], [disable tests])], enable_tests=$enableval, enable_tests=yes) @@ -1377,10 +1386,6 @@ AC_SUBST([rootlibdir], [$with_rootlibdir]) AC_CONFIG_FILES([ Makefile po/Makefile.in - docs/libudev/Makefile - docs/libudev/version.xml - docs/gudev/Makefile - docs/gudev/version.xml ]) AC_OUTPUT @@ -1395,8 +1400,10 @@ AC_MSG_RESULT([ SELinux: ${have_selinux} SECCOMP: ${have_seccomp} SMACK: ${have_smack} + ZLIB: ${have_zlib} XZ: ${have_xz} LZ4: ${have_lz4} + BZIP2: ${have_bzip2} ACL: ${have_acl} GCRYPT: ${have_gcrypt} QRENCODE: ${have_qrencode} @@ -1409,7 +1416,6 @@ AC_MSG_RESULT([ binfmt: ${have_binfmt} vconsole: ${have_vconsole} bootchart: ${have_bootchart} - quotacheck: ${have_quotacheck} tmpfiles: ${have_tmpfiles} sysusers: ${have_sysusers} firstboot: ${have_firstboot} @@ -1418,6 +1424,7 @@ AC_MSG_RESULT([ rfkill: ${have_rfkill} logind: ${have_logind} machined: ${have_machined} + importd: ${have_importd} hostnamed: ${have_hostnamed} timedated: ${have_timedated} timesyncd: ${have_timesyncd} @@ -1430,10 +1437,16 @@ AC_MSG_RESULT([ coredump: ${have_coredump} polkit: ${have_polkit} efi: ${have_efi} + gnuefi: ${have_gnuefi} + efi arch: ${EFI_ARCH} + EFI machine type: ${EFI_MACHINE_TYPE_NAME} + EFI CC ${EFI_CC} + EFI libdir: ${EFI_LIB_DIR} + EFI ldsdir: ${EFI_LDS_DIR} + EFI includedir: ${EFI_INC_DIR} kmod: ${have_kmod} xkbcommon: ${have_xkbcommon} blkid: ${have_blkid} - libmount: ${have_libmount} dbus: ${have_dbus} nss-myhostname: ${have_myhostname} gudev: ${enable_gudev} @@ -1449,7 +1462,8 @@ AC_MSG_RESULT([ Split /usr: ${enable_split_usr} SysV compatibility: ${SYSTEM_SYSV_COMPAT} compatibility libraries: ${have_compat_libs} - utmp/wtmp support: ${have_utmp} + ldconfig support: ${enable_ldconfig} + hibernate support: ${enable_hibernate} extra debugging: ${enable_debug} prefix: ${prefix}