diff options
author | Martin Pitt <martin.pitt@ubuntu.com> | 2015-02-17 11:22:16 +0100 |
---|---|---|
committer | Martin Pitt <martin.pitt@ubuntu.com> | 2015-02-17 11:22:16 +0100 |
commit | e735f4d4eafc8c8c296cefc8228cf91c3fcfe822 (patch) | |
tree | 6626785ac2b212cc52282387a0a0d8a20fee8db2 /configure | |
parent | f47781d88ca6bf69d6b1dd0703b2b283482e5c09 (diff) | |
download | systemd-e735f4d4eafc8c8c296cefc8228cf91c3fcfe822.tar.gz |
Imported Upstream version 219
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 657 |
1 files changed, 584 insertions, 73 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for systemd 218. +# Generated by GNU Autoconf 2.69 for systemd 219. # # Report bugs to <http://bugs.freedesktop.org/enter_bug.cgi?product=systemd>. # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='systemd' PACKAGE_TARNAME='systemd' -PACKAGE_VERSION='218' -PACKAGE_STRING='systemd 218' +PACKAGE_VERSION='219' +PACKAGE_STRING='systemd 219' PACKAGE_BUGREPORT='http://bugs.freedesktop.org/enter_bug.cgi?product=systemd' PACKAGE_URL='http://www.freedesktop.org/wiki/Software/systemd' @@ -644,7 +644,6 @@ pamconfdir pamlibdir zshcompletiondir bashcompletiondir -dbusinterfacedir dbussystemservicedir dbussessionservicedir dbuspolicydir @@ -652,6 +651,7 @@ ENABLE_TESTS_FALSE ENABLE_TESTS_TRUE ENABLE_GTK_DOC_TESTS_FALSE ENABLE_GTK_DOC_TESTS_TRUE +DEFAULT_DKR_INDEX_URL TTY_GID HAVE_SYSV_COMPAT_FALSE HAVE_SYSV_COMPAT_TRUE @@ -664,6 +664,8 @@ ENABLE_HIBERNATE_FALSE ENABLE_HIBERNATE_TRUE ENABLE_MANPAGES_FALSE ENABLE_MANPAGES_TRUE +ENABLE_HWDB_FALSE +ENABLE_HWDB_TRUE ENABLE_GUDEV_FALSE ENABLE_GUDEV_TRUE GLIB_LIBS @@ -682,6 +684,7 @@ ENABLE_TERMINAL_FALSE ENABLE_TERMINAL_TRUE TERMINAL_LIBS TERMINAL_CFLAGS +UNIFONT ENABLE_EFI_FALSE ENABLE_EFI_TRUE ENABLE_NETWORKD_FALSE @@ -704,6 +707,8 @@ ENABLE_TIMEDATED_FALSE ENABLE_TIMEDATED_TRUE ENABLE_HOSTNAMED_FALSE ENABLE_HOSTNAMED_TRUE +ENABLE_IMPORTD_FALSE +ENABLE_IMPORTD_TRUE ENABLE_MACHINED_FALSE ENABLE_MACHINED_TRUE ENABLE_LOGIND_FALSE @@ -728,6 +733,10 @@ ENABLE_VCONSOLE_FALSE ENABLE_VCONSOLE_TRUE ENABLE_BINFMT_FALSE ENABLE_BINFMT_TRUE +HAVE_LIBIPTC_FALSE +HAVE_LIBIPTC_TRUE +LIBIPTC_LIBS +LIBIPTC_CFLAGS HAVE_LIBIDN_FALSE HAVE_LIBIDN_TRUE LIBIDN_LIBS @@ -775,6 +784,12 @@ HAVE_COMPRESSION_FALSE HAVE_COMPRESSION_TRUE HAVE_LZ4_FALSE HAVE_LZ4_TRUE +HAVE_BZIP2_FALSE +HAVE_BZIP2_TRUE +HAVE_ZLIB_FALSE +HAVE_ZLIB_TRUE +ZLIB_LIBS +ZLIB_CFLAGS HAVE_XZ_FALSE HAVE_XZ_TRUE XZ_LIBS @@ -878,6 +893,7 @@ GTKDOC_CHECK PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG +SULOGIN KEXEC KMOD KILL @@ -1079,6 +1095,8 @@ with_debug_shell with_debug_tty with_certificate_root enable_xz +enable_zlib +enable_bzip2 enable_lz4 enable_pam enable_acl @@ -1094,6 +1112,7 @@ enable_microhttpd enable_gnutls enable_libcurl enable_libidn +enable_libiptc enable_binfmt enable_vconsole enable_bootchart @@ -1106,6 +1125,7 @@ enable_backlight enable_rfkill enable_logind enable_machined +enable_importd enable_hostnamed enable_timedated enable_timesyncd @@ -1120,6 +1140,7 @@ enable_resolved with_dns_servers enable_networkd enable_efi +with_unifont enable_terminal enable_kdbus with_rc_local_script_path_start @@ -1129,6 +1150,7 @@ with_kbd_setfont with_telinit enable_myhostname enable_gudev +enable_hwdb enable_manpages enable_hibernate enable_ldconfig @@ -1138,7 +1160,6 @@ with_tty_gid with_dbuspolicydir with_dbussessionservicedir with_dbussystemservicedir -with_dbusinterfacedir with_bashcompletiondir with_zshcompletiondir with_rootprefix @@ -1146,8 +1167,9 @@ with_rootlibdir with_pamlibdir with_pamconfdir enable_split_usr +with_dkr_index_url enable_tests -enable_hashmap_debug +enable_debug ' ac_precious_vars='build_alias host_alias @@ -1185,6 +1207,8 @@ APPARMOR_CFLAGS APPARMOR_LIBS XZ_CFLAGS XZ_LIBS +ZLIB_CFLAGS +ZLIB_LIBS LIBCRYPTSETUP_CFLAGS LIBCRYPTSETUP_LIBS QRENCODE_CFLAGS @@ -1197,6 +1221,8 @@ LIBCURL_CFLAGS LIBCURL_LIBS LIBIDN_CFLAGS LIBIDN_LIBS +LIBIPTC_CFLAGS +LIBIPTC_LIBS TERMINAL_CFLAGS TERMINAL_LIBS GLIB_CFLAGS @@ -1741,7 +1767,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures systemd 218 to adapt to many kinds of systems. +\`configure' configures systemd 219 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1811,7 +1837,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of systemd 218:";; + short | recursive ) echo "Configuration of systemd 219:";; esac cat <<\_ACEOF @@ -1858,6 +1884,8 @@ Optional Features: --disable-selinux Disable optional SELINUX support --disable-apparmor Disable optional AppArmor support --disable-xz Disable optional XZ support + --disable-zlib Disable optional ZLIB support + --enable-bzip2 Disable optional BZIP2 support --enable-lz4 Enable optional LZ4 support --disable-pam Disable optional PAM support --disable-acl Disable optional ACL support @@ -1871,6 +1899,7 @@ Optional Features: --disable-gnutls disable gnutls support --disable-libcurl disable libcurl support --disable-libidn Disable optional LIBIDN support + --disable-libiptc Disable optional LIBIPTC support --disable-binfmt disable binfmt tool --disable-vconsole disable vconsole tool --disable-bootchart disable bootchart tool @@ -1883,6 +1912,7 @@ Optional Features: --disable-rfkill disable rfkill tools --disable-logind disable login daemon --disable-machined disable machine daemon + --disable-importd disable import daemon --disable-hostnamed disable hostname daemon --disable-timedated disable timedate daemon --disable-timesyncd disable timesync daemon @@ -1896,12 +1926,13 @@ Optional Features: --enable-kdbus do connect to kdbus by default --disable-myhostname disable nss-myhostname support --disable-gudev disable Gobject libudev support [default=enabled] + --disable-hwdb disable hardware database support --disable-manpages disable manpages --disable-hibernate disable hibernation support --disable-ldconfig disable ldconfig --enable-split-usr Assume that /bin, /sbin aren\'t symlinks into /usr --disable-tests disable tests - --enable-hashmap-debug enable hashmap debugging + --enable-debug[=LIST] enable extra debugging (hashmap,mmap-cache) Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1934,6 +1965,7 @@ Optional Packages: --with-dns-servers=DNSSERVERS Space-separated list of default DNS servers + --with-unifont=PATH Path to unifont.hex --with-rc-local-script-path-start=PATH Path to /etc/rc.local --with-rc-local-script-path-stop=PATH @@ -1955,8 +1987,6 @@ Optional Packages: D-Bus session service directory --with-dbussystemservicedir=DIR D-Bus system service directory - --with-dbusinterfacedir=DIR - D-Bus interface directory --with-bashcompletiondir=DIR Bash completions directory --with-zshcompletiondir=DIR @@ -1966,6 +1996,8 @@ Optional Packages: --with-rootlibdir=DIR Root directory for libraries necessary for boot --with-pamlibdir=DIR Directory for PAM modules --with-pamconfdir=DIR Directory for PAM configuration + --dkr-index-url=URL Specify the default index URL to use for image + downloads Some influential environment variables: CC C compiler command @@ -2020,6 +2052,8 @@ Some influential environment variables: linker flags for APPARMOR, overriding pkg-config XZ_CFLAGS C compiler flags for XZ, overriding pkg-config XZ_LIBS linker flags for XZ, overriding pkg-config + ZLIB_CFLAGS C compiler flags for ZLIB, overriding pkg-config + ZLIB_LIBS linker flags for ZLIB, overriding pkg-config LIBCRYPTSETUP_CFLAGS C compiler flags for LIBCRYPTSETUP, overriding pkg-config LIBCRYPTSETUP_LIBS @@ -2042,6 +2076,10 @@ Some influential environment variables: LIBIDN_CFLAGS C compiler flags for LIBIDN, overriding pkg-config LIBIDN_LIBS linker flags for LIBIDN, overriding pkg-config + LIBIPTC_CFLAGS + C compiler flags for LIBIPTC, overriding pkg-config + LIBIPTC_LIBS + linker flags for LIBIPTC, overriding pkg-config TERMINAL_CFLAGS C compiler flags for TERMINAL, overriding pkg-config TERMINAL_LIBS @@ -2116,7 +2154,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -systemd configure 218 +systemd configure 219 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2768,7 +2806,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by systemd $as_me 218, which was +It was created by systemd $as_me 219, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -5233,7 +5271,7 @@ fi # Define the identity of the package. PACKAGE='systemd' - VERSION='218' + VERSION='219' cat >>confdefs.h <<_ACEOF @@ -14145,6 +14183,49 @@ fi +# Extract the first word of "sulogin", so it can be a program name with args. +set dummy sulogin; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_path_SULOGIN+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $SULOGIN in + [\\/]* | ?:[\\/]*) + ac_cv_path_SULOGIN="$SULOGIN" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/usr/sbin:/sbin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_SULOGIN="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_path_SULOGIN" && ac_cv_path_SULOGIN="/usr/sbin/sulogin" + ;; +esac +fi +SULOGIN=$ac_cv_path_SULOGIN +if test -n "$SULOGIN"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SULOGIN" >&5 +$as_echo "$SULOGIN" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if ! ln --relative --help > /dev/null 2>&1; then : as_fn_error $? "*** ln doesn't support --relative ***" "$LINENO" 5 fi @@ -16436,6 +16517,44 @@ fi cat >>confdefs.h <<_ACEOF #define HAVE_DECL_GETRANDOM $ac_have_decl _ACEOF +ac_fn_c_check_decl "$LINENO" "renameat2" "ac_cv_have_decl_renameat2" " +#include <sys/types.h> +#include <unistd.h> +#include <sys/mount.h> +#include <fcntl.h> +#include <sched.h> +#include <linux/loop.h> +#include <linux/random.h> + +" +if test "x$ac_cv_have_decl_renameat2" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_RENAMEAT2 $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "kcmp" "ac_cv_have_decl_kcmp" " +#include <sys/types.h> +#include <unistd.h> +#include <sys/mount.h> +#include <fcntl.h> +#include <sched.h> +#include <linux/loop.h> +#include <linux/random.h> + +" +if test "x$ac_cv_have_decl_kcmp" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_KCMP $ac_have_decl +_ACEOF ac_fn_c_check_decl "$LINENO" "LO_FLAGS_PARTSCAN" "ac_cv_have_decl_LO_FLAGS_PARTSCAN" " #include <sys/types.h> #include <unistd.h> @@ -16457,6 +16576,27 @@ cat >>confdefs.h <<_ACEOF _ACEOF +ac_fn_c_check_decl "$LINENO" "IFLA_INET6_ADDR_GEN_MODE" "ac_cv_have_decl_IFLA_INET6_ADDR_GEN_MODE" " +#include <inttypes.h> +#include <netinet/in.h> +#include <netinet/ether.h> +#include <linux/rtnetlink.h> +#include <net/if.h> +#include <linux/ip.h> +#include <linux/if_tunnel.h> +#include <linux/if_link.h> +#include <linux/if_bridge.h> + +" +if test "x$ac_cv_have_decl_IFLA_INET6_ADDR_GEN_MODE" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_IFLA_INET6_ADDR_GEN_MODE $ac_have_decl +_ACEOF ac_fn_c_check_decl "$LINENO" "IFLA_MACVLAN_FLAGS" "ac_cv_have_decl_IFLA_MACVLAN_FLAGS" " #include <inttypes.h> #include <netinet/in.h> @@ -16478,6 +16618,27 @@ fi cat >>confdefs.h <<_ACEOF #define HAVE_DECL_IFLA_MACVLAN_FLAGS $ac_have_decl _ACEOF +ac_fn_c_check_decl "$LINENO" "IFLA_IPVLAN_MODE" "ac_cv_have_decl_IFLA_IPVLAN_MODE" " +#include <inttypes.h> +#include <netinet/in.h> +#include <netinet/ether.h> +#include <linux/rtnetlink.h> +#include <net/if.h> +#include <linux/ip.h> +#include <linux/if_tunnel.h> +#include <linux/if_link.h> +#include <linux/if_bridge.h> + +" +if test "x$ac_cv_have_decl_IFLA_IPVLAN_MODE" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_IFLA_IPVLAN_MODE $ac_have_decl +_ACEOF ac_fn_c_check_decl "$LINENO" "IFLA_VTI_REMOTE" "ac_cv_have_decl_IFLA_VTI_REMOTE" " #include <inttypes.h> #include <netinet/in.h> @@ -17117,12 +17278,12 @@ if test -n "$BLKID_CFLAGS"; then pkg_cv_BLKID_CFLAGS="$BLKID_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" blkid >= 2.20 \""; } >&5 - ($PKG_CONFIG --exists --print-errors " blkid >= 2.20 ") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" blkid >= 2.24 \""; } >&5 + ($PKG_CONFIG --exists --print-errors " blkid >= 2.24 ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_BLKID_CFLAGS=`$PKG_CONFIG --cflags " blkid >= 2.20 " 2>/dev/null` + pkg_cv_BLKID_CFLAGS=`$PKG_CONFIG --cflags " blkid >= 2.24 " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -17134,12 +17295,12 @@ if test -n "$BLKID_LIBS"; then pkg_cv_BLKID_LIBS="$BLKID_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" blkid >= 2.20 \""; } >&5 - ($PKG_CONFIG --exists --print-errors " blkid >= 2.20 ") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" blkid >= 2.24 \""; } >&5 + ($PKG_CONFIG --exists --print-errors " blkid >= 2.24 ") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_BLKID_LIBS=`$PKG_CONFIG --libs " blkid >= 2.20 " 2>/dev/null` + pkg_cv_BLKID_LIBS=`$PKG_CONFIG --libs " blkid >= 2.24 " 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -17160,9 +17321,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " blkid >= 2.20 " 2>&1` + BLKID_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " blkid >= 2.24 " 2>&1` else - BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " blkid >= 2.20 " 2>&1` + BLKID_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " blkid >= 2.24 " 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$BLKID_PKG_ERRORS" >&5 @@ -17758,31 +17919,11 @@ fi # Put the nasty error message in config.log where it belongs echo "$XZ_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements ( liblzma ) were not met: - -$XZ_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables XZ_CFLAGS -and XZ_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 + have_xz=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables XZ_CFLAGS -and XZ_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details" "$LINENO" 5; } + have_xz=no else XZ_CFLAGS=$pkg_cv_XZ_CFLAGS XZ_LIBS=$pkg_cv_XZ_LIBS @@ -17806,13 +17947,147 @@ fi # ------------------------------------------------------------------------------ +have_zlib=no +# Check whether --enable-zlib was given. +if test "${enable_zlib+set}" = set; then : + enableval=$enable_zlib; +fi + +if test "x$enable_zlib" != "xno"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ZLIB" >&5 +$as_echo_n "checking for ZLIB... " >&6; } + +if test -n "$ZLIB_CFLAGS"; then + pkg_cv_ZLIB_CFLAGS="$ZLIB_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" zlib \""; } >&5 + ($PKG_CONFIG --exists --print-errors " zlib ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ZLIB_CFLAGS=`$PKG_CONFIG --cflags " zlib " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$ZLIB_LIBS"; then + pkg_cv_ZLIB_LIBS="$ZLIB_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \" zlib \""; } >&5 + ($PKG_CONFIG --exists --print-errors " zlib ") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_ZLIB_LIBS=`$PKG_CONFIG --libs " zlib " 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + ZLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs " zlib " 2>&1` + else + ZLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs " zlib " 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$ZLIB_PKG_ERRORS" >&5 + + have_zlib=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_zlib=no +else + ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS + ZLIB_LIBS=$pkg_cv_ZLIB_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_ZLIB 1" >>confdefs.h + have_zlib=yes +fi + if test "x$have_zlib" = xno -a "x$enable_zlib" = xyes; then + as_fn_error $? "*** ZLIB support requested but libraries not found" "$LINENO" 5 + fi +fi + if test "$have_zlib" = "yes"; then + HAVE_ZLIB_TRUE= + HAVE_ZLIB_FALSE='#' +else + HAVE_ZLIB_TRUE='#' + HAVE_ZLIB_FALSE= +fi + + +# ------------------------------------------------------------------------------ +have_bzip2=no +# Check whether --enable-bzip2 was given. +if test "${enable_bzip2+set}" = set; then : + enableval=$enable_bzip2; +fi + +if test "x$enable_bzip2" != "xno"; then : + + for ac_header in bzlib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "bzlib.h" "ac_cv_header_bzlib_h" "$ac_includes_default" +if test "x$ac_cv_header_bzlib_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_BZLIB_H 1 +_ACEOF + +$as_echo "#define HAVE_BZIP2 1" >>confdefs.h + + have_bzip2=yes +else + if test "x$have_bzip2" = xyes; then : + as_fn_error $? "*** BZIP2 support requested but headers not found" "$LINENO" 5 +fi + +fi + +done + + +fi + if test "$have_bzip2" = "yes"; then + HAVE_BZIP2_TRUE= + HAVE_BZIP2_FALSE='#' +else + HAVE_BZIP2_TRUE='#' + HAVE_BZIP2_FALSE= +fi + + +# ------------------------------------------------------------------------------ have_lz4=no # Check whether --enable-lz4 was given. if test "${enable_lz4+set}" = set; then : enableval=$enable_lz4; fi -if test "x$enable_lz4" == "xyes"; then : +if test "x$enable_lz4" = "xyes"; then : for ac_header in lz4.h do : @@ -18031,6 +18306,7 @@ fi $as_echo "#define HAVE_ACL 1" >>confdefs.h + M4_DEFINES="$M4_DEFINES -DHAVE_ACL" else have_acl=no fi @@ -19149,6 +19425,102 @@ fi # ------------------------------------------------------------------------------ +have_libiptc=no +# Check whether --enable-libiptc was given. +if test "${enable_libiptc+set}" = set; then : + enableval=$enable_libiptc; +fi + +if test "x$enable_libiptc" != "xno"; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBIPTC" >&5 +$as_echo_n "checking for LIBIPTC... " >&6; } + +if test -n "$LIBIPTC_CFLAGS"; then + pkg_cv_LIBIPTC_CFLAGS="$LIBIPTC_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiptc\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libiptc") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBIPTC_CFLAGS=`$PKG_CONFIG --cflags "libiptc" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBIPTC_LIBS"; then + pkg_cv_LIBIPTC_LIBS="$LIBIPTC_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiptc\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libiptc") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBIPTC_LIBS=`$PKG_CONFIG --libs "libiptc" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LIBIPTC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libiptc" 2>&1` + else + LIBIPTC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libiptc" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBIPTC_PKG_ERRORS" >&5 + + have_libiptc=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_libiptc=no +else + LIBIPTC_CFLAGS=$pkg_cv_LIBIPTC_CFLAGS + LIBIPTC_LIBS=$pkg_cv_LIBIPTC_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + +$as_echo "#define HAVE_LIBIPTC 1" >>confdefs.h + + have_libiptc=yes + M4_DEFINES="$M4_DEFINES -DHAVE_LIBIPTC" +fi + if test "x$have_libiptc" = "xno" -a "x$enable_libiptc" = "xyes"; then + as_fn_error $? "*** libiptc support requested but libraries not found" "$LINENO" 5 + fi +fi + if test "$have_libiptc" = "yes"; then + HAVE_LIBIPTC_TRUE= + HAVE_LIBIPTC_FALSE='#' +else + HAVE_LIBIPTC_TRUE='#' + HAVE_LIBIPTC_FALSE= +fi + + +# ------------------------------------------------------------------------------ have_binfmt=no # Check whether --enable-binfmt was given. if test "${enable_binfmt+set}" = set; then : @@ -19387,6 +19759,30 @@ $as_echo "#define HAVE_MACHINED 1" >>confdefs.h fi # ------------------------------------------------------------------------------ +have_importd=no +# Check whether --enable-importd was given. +if test "${enable_importd+set}" = set; then : + enableval=$enable_importd; +fi + +if test "x$enable_importd" != "xno"; then + have_importd=yes +fi + if test "$have_importd" = "yes"; then + ENABLE_IMPORTD_TRUE= + ENABLE_IMPORTD_FALSE='#' +else + ENABLE_IMPORTD_TRUE='#' + ENABLE_IMPORTD_FALSE= +fi + +if test "$have_importd" = "yes"; then : + +$as_echo "#define HAVE_IMPORTD 1" >>confdefs.h + +fi + +# ------------------------------------------------------------------------------ have_hostnamed=no # Check whether --enable-hostnamed was given. if test "${enable_hostnamed+set}" = set; then : @@ -19653,7 +20049,18 @@ fi # ------------------------------------------------------------------------------ + +# Check whether --with-unifont was given. +if test "${with_unifont+set}" = set; then : + withval=$with_unifont; UNIFONT="$withval" +else + UNIFONT="/usr/share/unifont/unifont.hex" +fi + + + have_terminal=no +have_unifont=no # Check whether --enable-terminal was given. if test "${enable_terminal+set}" = set; then : enableval=$enable_terminal; @@ -19751,15 +20158,36 @@ else $as_echo "yes" >&6; } have_terminal=yes fi - if test "x$have_terminal" != xyes -a "x$enable_terminal" = xyes; then : + as_ac_File=`$as_echo "ac_cv_file_$UNIFONT" | $as_tr_sh` +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $UNIFONT" >&5 +$as_echo_n "checking for $UNIFONT... " >&6; } +if eval \${$as_ac_File+:} false; then : + $as_echo_n "(cached) " >&6 +else + test "$cross_compiling" = yes && + as_fn_error $? "cannot check for file existence when cross compiling" "$LINENO" 5 +if test -r "$UNIFONT"; then + eval "$as_ac_File=yes" +else + eval "$as_ac_File=no" +fi +fi +eval ac_res=\$$as_ac_File + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +if eval test \"x\$"$as_ac_File"\" = x"yes"; then : + have_unifont=yes +fi + + if test "x$have_terminal" != xyes -o "x$have_unifont" != "xyes" -a "x$enable_terminal" = xyes; then : as_fn_error $? "*** terminal support requested but required dependencies not available" "$LINENO" 5 -elif test "x$have_terminal" = xyes; then : +elif test "x$have_terminal" = xyes -a "x$have_unifont" = "xyes"; then : $as_echo "#define ENABLE_TERMINAL 1" >>confdefs.h fi fi - if test "x$have_terminal" = "xyes"; then + if test "x$have_terminal" = "xyes" -a "x$have_unifont" = "xyes"; then ENABLE_TERMINAL_TRUE= ENABLE_TERMINAL_FALSE='#' else @@ -20441,6 +20869,23 @@ $as_echo "#define HAVE_GLIB 1" >>confdefs.h fi # ------------------------------------------------------------------------------ +# Check whether --enable-hwdb was given. +if test "${enable_hwdb+set}" = set; then : + enableval=$enable_hwdb; enable_hwdb=$enableval +else + enable_hwdb=yes +fi + + if test x$enable_hwdb = xyes; then + ENABLE_HWDB_TRUE= + ENABLE_HWDB_FALSE='#' +else + ENABLE_HWDB_TRUE='#' + ENABLE_HWDB_FALSE= +fi + + +# ------------------------------------------------------------------------------ have_manpages=no # Check whether --enable-manpages was given. if test "${enable_manpages+set}" = set; then : @@ -20558,7 +21003,7 @@ _ACEOF if test "${with_dbuspolicydir+set}" = set; then : withval=$with_dbuspolicydir; else - with_dbuspolicydir=$($PKG_CONFIG --variable=sysconfdir dbus-1)/dbus-1/system.d + with_dbuspolicydir=${sysconfdir}/dbus-1/system.d fi @@ -20567,7 +21012,7 @@ fi if test "${with_dbussessionservicedir+set}" = set; then : withval=$with_dbussessionservicedir; else - with_dbussessionservicedir=$($PKG_CONFIG --variable=session_bus_services_dir dbus-1) + with_dbussessionservicedir=${datadir}/dbus-1/services fi @@ -20576,16 +21021,7 @@ fi if test "${with_dbussystemservicedir+set}" = set; then : withval=$with_dbussystemservicedir; else - with_dbussystemservicedir=$(readlink -m $($PKG_CONFIG --variable=session_bus_services_dir dbus-1)/../system-services) -fi - - - -# Check whether --with-dbusinterfacedir was given. -if test "${with_dbusinterfacedir+set}" = set; then : - withval=$with_dbusinterfacedir; -else - with_dbusinterfacedir=$(readlink -m $($PKG_CONFIG --variable=session_bus_services_dir dbus-1)/../interfaces) + with_dbussystemservicedir=${datadir}/dbus-1/system-services fi @@ -20667,6 +21103,22 @@ fi fi + +# Check whether --with-dkr-index-url was given. +if test "${with_dkr_index_url+set}" = set; then : + withval=$with_dkr_index_url; DEFAULT_DKR_INDEX_URL="\"$withval\"" +else + DEFAULT_DKR_INDEX_URL="NULL" +fi + + + +cat >>confdefs.h <<_ACEOF +#define DEFAULT_DKR_INDEX_URL $DEFAULT_DKR_INDEX_URL +_ACEOF + + + if test "x${enable_split_usr}" = "xyes"; then : @@ -20707,20 +21159,45 @@ else fi -# Check whether --enable-hashmap-debug was given. -if test "${enable_hashmap_debug+set}" = set; then : - enableval=$enable_hashmap_debug; enable_hashmap_debug=$enableval -else - enable_hashmap_debug=no +# Check whether --enable-debug was given. +if test "${enable_debug+set}" = set; then : + enableval=$enable_debug; if test "x$enableval" = "xyes"; then + enableval="hashmap,mmap-cache" + fi + saved_ifs="$IFS" + IFS="$IFS$PATH_SEPARATOR," + for name in $enableval; do + case $name in + hashmap) + enable_debug_hashmap=yes + ;; + mmap-cache) + enable_debug_mmap_cache=yes + ;; + esac + done + IFS="$saved_ifs" fi -if test x$enable_hashmap_debug = xyes; then : +enable_debug="" +if test x$enable_debug_hashmap = xyes; then : + + +$as_echo "#define ENABLE_DEBUG_HASHMAP 1" >>confdefs.h -$as_echo "#define ENABLE_HASHMAP_DEBUG 1" >>confdefs.h + enable_debug="hashmap $enable_debug" +fi +if test x$enable_debug_mmap_cache = xyes; then : + + +$as_echo "#define ENABLE_DEBUG_MMAP_CACHE 1" >>confdefs.h + + enable_debug="mmap-cache $enable_debug" fi +test -z "$enable_debug" && enable_debug="none" dbuspolicydir=$with_dbuspolicydir @@ -20728,8 +21205,6 @@ dbussessionservicedir=$with_dbussessionservicedir dbussystemservicedir=$with_dbussystemservicedir -dbusinterfacedir=$with_dbusinterfacedir - bashcompletiondir=$with_bashcompletiondir zshcompletiondir=$with_zshcompletiondir @@ -20971,6 +21446,14 @@ if test -z "${HAVE_XZ_TRUE}" && test -z "${HAVE_XZ_FALSE}"; then as_fn_error $? "conditional \"HAVE_XZ\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_ZLIB_TRUE}" && test -z "${HAVE_ZLIB_FALSE}"; then + as_fn_error $? "conditional \"HAVE_ZLIB\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HAVE_BZIP2_TRUE}" && test -z "${HAVE_BZIP2_FALSE}"; then + as_fn_error $? "conditional \"HAVE_BZIP2\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${HAVE_LZ4_TRUE}" && test -z "${HAVE_LZ4_FALSE}"; then as_fn_error $? "conditional \"HAVE_LZ4\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21023,6 +21506,10 @@ if test -z "${HAVE_LIBIDN_TRUE}" && test -z "${HAVE_LIBIDN_FALSE}"; then as_fn_error $? "conditional \"HAVE_LIBIDN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${HAVE_LIBIPTC_TRUE}" && test -z "${HAVE_LIBIPTC_FALSE}"; then + as_fn_error $? "conditional \"HAVE_LIBIPTC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_BINFMT_TRUE}" && test -z "${ENABLE_BINFMT_FALSE}"; then as_fn_error $? "conditional \"ENABLE_BINFMT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21071,6 +21558,10 @@ if test -z "${ENABLE_MACHINED_TRUE}" && test -z "${ENABLE_MACHINED_FALSE}"; then as_fn_error $? "conditional \"ENABLE_MACHINED\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_IMPORTD_TRUE}" && test -z "${ENABLE_IMPORTD_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_IMPORTD\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_HOSTNAMED_TRUE}" && test -z "${ENABLE_HOSTNAMED_FALSE}"; then as_fn_error $? "conditional \"ENABLE_HOSTNAMED\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21123,6 +21614,10 @@ if test -z "${ENABLE_GUDEV_TRUE}" && test -z "${ENABLE_GUDEV_FALSE}"; then as_fn_error $? "conditional \"ENABLE_GUDEV\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_HWDB_TRUE}" && test -z "${ENABLE_HWDB_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_HWDB\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_MANPAGES_TRUE}" && test -z "${ENABLE_MANPAGES_FALSE}"; then as_fn_error $? "conditional \"ENABLE_MANPAGES\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21544,7 +22039,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by systemd $as_me 218, which was +This file was extended by systemd $as_me 219, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21611,7 +22106,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -systemd config.status 218 +systemd config.status 219 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -23414,8 +23909,10 @@ fi 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} @@ -23424,6 +23921,7 @@ fi GNUTLS: ${have_gnutls} libcurl: ${have_libcurl} libidn: ${have_libidn} + libiptc: ${have_libiptc} ELFUTILS: ${have_elfutils} binfmt: ${have_binfmt} vconsole: ${have_vconsole} @@ -23437,6 +23935,7 @@ fi rfkill: ${have_rfkill} logind: ${have_logind} machined: ${have_machined} + importd: ${have_importd} hostnamed: ${have_hostnamed} timedated: ${have_timedated} timesyncd: ${have_timesyncd} @@ -23456,6 +23955,7 @@ fi dbus: ${have_dbus} nss-myhostname: ${have_myhostname} gudev: ${enable_gudev} + hwdb: ${enable_hwdb} gintrospection: ${enable_introspection} terminal: ${have_terminal} kdbus: ${have_kdbus} @@ -23468,6 +23968,9 @@ fi 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} rootprefix: ${with_rootprefix} @@ -23487,7 +23990,6 @@ fi D-Bus policy dir: ${with_dbuspolicydir} D-Bus session dir: ${with_dbussessionservicedir} D-Bus system dir: ${with_dbussystemservicedir} - D-Bus interfaces dir: ${with_dbusinterfacedir} Bash completions dir: ${with_bashcompletiondir} Zsh completions dir: ${with_zshcompletiondir} Extra start script: ${RC_LOCAL_SCRIPT_PATH_START} @@ -23497,6 +23999,7 @@ fi Maximum System UID: ${SYSTEM_UID_MAX} Maximum System GID: ${SYSTEM_GID_MAX} Certificate root: ${CERTIFICATEROOT} + Default dkr Index ${DEFAULT_DKR_INDEX_URL} CFLAGS: ${OUR_CFLAGS} ${CFLAGS} CPPFLAGS: ${OUR_CPPFLAGS} ${CPPFLAGS} @@ -23515,8 +24018,10 @@ $as_echo " 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} @@ -23525,6 +24030,7 @@ $as_echo " GNUTLS: ${have_gnutls} libcurl: ${have_libcurl} libidn: ${have_libidn} + libiptc: ${have_libiptc} ELFUTILS: ${have_elfutils} binfmt: ${have_binfmt} vconsole: ${have_vconsole} @@ -23538,6 +24044,7 @@ $as_echo " rfkill: ${have_rfkill} logind: ${have_logind} machined: ${have_machined} + importd: ${have_importd} hostnamed: ${have_hostnamed} timedated: ${have_timedated} timesyncd: ${have_timesyncd} @@ -23557,6 +24064,7 @@ $as_echo " dbus: ${have_dbus} nss-myhostname: ${have_myhostname} gudev: ${enable_gudev} + hwdb: ${enable_hwdb} gintrospection: ${enable_introspection} terminal: ${have_terminal} kdbus: ${have_kdbus} @@ -23569,6 +24077,9 @@ $as_echo " 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} rootprefix: ${with_rootprefix} @@ -23588,7 +24099,6 @@ $as_echo " D-Bus policy dir: ${with_dbuspolicydir} D-Bus session dir: ${with_dbussessionservicedir} D-Bus system dir: ${with_dbussystemservicedir} - D-Bus interfaces dir: ${with_dbusinterfacedir} Bash completions dir: ${with_bashcompletiondir} Zsh completions dir: ${with_zshcompletiondir} Extra start script: ${RC_LOCAL_SCRIPT_PATH_START} @@ -23598,6 +24108,7 @@ $as_echo " Maximum System UID: ${SYSTEM_UID_MAX} Maximum System GID: ${SYSTEM_GID_MAX} Certificate root: ${CERTIFICATEROOT} + Default dkr Index ${DEFAULT_DKR_INDEX_URL} CFLAGS: ${OUR_CFLAGS} ${CFLAGS} CPPFLAGS: ${OUR_CPPFLAGS} ${CPPFLAGS} |