X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=43b6eef780af9b8e881c9fb9c9901688649df5c3;hp=ae88382e21c75f4ecb19ac85ebcaa38cbc1aebfe;hb=699bd879efdf17c663b66fac8ca4f9cd4a946260;hpb=252ff40a3827b4e8e62e03a5e2f80da3fe02bee6 diff --git a/configure.ac b/configure.ac index ae88382e2..43b6eef78 100644 --- a/configure.ac +++ b/configure.ac @@ -183,6 +183,7 @@ CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\ -Wno-unused-parameter \ -Wno-missing-field-initializers \ -Wno-unused-result \ + -Wno-typedef-redefinition \ -Werror=overflow \ -Wdate-time \ -Wnested-externs \ @@ -310,7 +311,9 @@ AC_CHECK_DECLS([gettid, pivot_root, name_to_handle_at, setns, LO_FLAGS_PARTSCAN] #include ]]) -AC_CHECK_DECLS([IFLA_PHYS_PORT_ID, +AC_CHECK_DECLS([IFLA_MACVLAN_FLAGS, + IFLA_VTI_REMOTE, + IFLA_PHYS_PORT_ID, IFLA_BOND_AD_INFO, IFLA_VLAN_PROTOCOL, IFLA_VXLAN_LOCAL6, @@ -498,18 +501,38 @@ AC_ARG_WITH([debug-tty], AC_SUBST(DEBUGTTY) +AC_ARG_WITH([certificate-root], + AS_HELP_STRING([--with-certificate-root=PATH], + [Specify the prefix for TLS certificates [/etc/ssl]]), + [CERTIFICATEROOT="$withval"], + [CERTIFICATEROOT="/etc/ssl"]) + +AC_SUBST(CERTIFICATEROOT) + # ------------------------------------------------------------------------------ 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], have_xz=no) + [AC_DEFINE(HAVE_XZ, 1, [Define if XZ is available]) have_xz=yes]) if test "x$have_xz" = xno -a "x$enable_xz" = xyes; then - AC_MSG_ERROR([*** Xz support requested but libraries not found]) + AC_MSG_ERROR([*** XZ support requested but libraries not found]) fi fi AM_CONDITIONAL(HAVE_XZ, [test "$have_xz" = "yes"]) +# ------------------------------------------------------------------------------ +have_lz4=no +AC_ARG_ENABLE(lz4, AS_HELP_STRING([--enable-lz4], [Enable optional LZ4 support])) +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])]) +]) +AM_CONDITIONAL(HAVE_LZ4, [test "$have_lz4" = "yes"]) + +AM_CONDITIONAL(HAVE_COMPRESSION, [test "$have_xz" = "yes" -o "$have_lz4" = "yes"]) + # ------------------------------------------------------------------------------ AC_ARG_ENABLE([pam], AS_HELP_STRING([--disable-pam],[Disable optional PAM support]), @@ -775,6 +798,18 @@ if test "x$enable_gnutls" != "xno"; then fi AM_CONDITIONAL(HAVE_GNUTLS, [test "$have_gnutls" = "yes"]) +# ------------------------------------------------------------------------------ +have_libcurl=no +AC_ARG_ENABLE(libcurl, AS_HELP_STRING([--disable-libcurl], [disable libcurl support])) +if test "x$enable_libcurl" != "xno"; then + PKG_CHECK_MODULES(LIBCURL, [libcurl], + [AC_DEFINE(HAVE_LIBCURL, 1, [Define if libcurl is available]) have_libcurl=yes], have_libcurl=no) + if test "x$have_libcurl" = xno -a "x$enable_libcurl" = xyes; then + AC_MSG_ERROR([*** libcurl support requested but libraries not found]) + fi +fi +AM_CONDITIONAL(HAVE_LIBCURL, [test "$have_libcurl" = "yes"]) + # ------------------------------------------------------------------------------ have_binfmt=no AC_ARG_ENABLE(binfmt, AS_HELP_STRING([--disable-binfmt], [disable binfmt tool])) @@ -831,6 +866,14 @@ if test "x$enable_sysusers" != "xno"; then fi AM_CONDITIONAL(ENABLE_SYSUSERS, [test "$have_sysusers" = "yes"]) +# ------------------------------------------------------------------------------ +have_firstboot=no +AC_ARG_ENABLE(firstboot, AS_HELP_STRING([--disable-firstboot], [disable firstboot support])) +if test "x$enable_firstboot" != "xno"; then + have_firstboot=yes +fi +AM_CONDITIONAL(ENABLE_FIRSTBOOT, [test "$have_firstboot" = "yes"]) + # ------------------------------------------------------------------------------ have_randomseed=no AC_ARG_ENABLE(randomseed, AS_HELP_STRING([--disable-randomseed], [disable randomseed tools])) @@ -1002,6 +1045,15 @@ if test "x$enable_multi_seat_x" != "xno"; then fi AM_CONDITIONAL(ENABLE_MULTI_SEAT_X, [test "$have_multi_seat_x" = "yes"]) +# ------------------------------------------------------------------------------ +have_terminal=no +AC_ARG_ENABLE(terminal, AS_HELP_STRING([--enable-terminal], [enable terminal support])) +if test "x$enable_terminal" = "xyes"; then + AC_DEFINE(ENABLE_TERMINAL, 1, [Define if terminal support is to be enabled]) + have_terminal=yes +fi +AM_CONDITIONAL(ENABLE_TERMINAL, [test "x$have_terminal" = "xyes"]) + # ------------------------------------------------------------------------------ have_kdbus=no AC_ARG_ENABLE(kdbus, AS_HELP_STRING([--enable-kdbus], [do connect to kdbus by default])) @@ -1266,12 +1318,14 @@ AC_MSG_RESULT([ SECCOMP: ${have_seccomp} SMACK: ${have_smack} XZ: ${have_xz} + LZ4: ${have_lz4} ACL: ${have_acl} GCRYPT: ${have_gcrypt} QRENCODE: ${have_qrencode} MICROHTTPD: ${have_microhttpd} CHKCONFIG: ${have_chkconfig} GNUTLS: ${have_gnutls} + libcurl: ${have_libcurl} ELFUTILS: ${have_elfutils} binfmt: ${have_binfmt} vconsole: ${have_vconsole} @@ -1280,6 +1334,7 @@ AC_MSG_RESULT([ quotacheck: ${have_quotacheck} tmpfiles: ${have_tmpfiles} sysusers: ${have_sysusers} + firstboot: ${have_firstboot} randomseed: ${have_randomseed} backlight: ${have_backlight} rfkill: ${have_rfkill} @@ -1304,6 +1359,7 @@ AC_MSG_RESULT([ gudev: ${enable_gudev} gintrospection: ${enable_introspection} multi-seat-x: ${have_multi_seat_x} + terminal: ${have_terminal} kdbus: ${have_kdbus} Python: ${have_python} Python Headers: ${have_python_devel} @@ -1342,6 +1398,7 @@ AC_MSG_RESULT([ TTY GID: ${TTY_GID} Maximum System UID: ${SYSTEM_UID_MAX} Maximum System GID: ${SYSTEM_GID_MAX} + Certificate root: ${CERTIFICATEROOT} CFLAGS: ${OUR_CFLAGS} ${CFLAGS} CPPFLAGS: ${OUR_CPPFLAGS} ${CPPFLAGS}