chiark / gitweb /
Remove timesyncd check, along with NTP server and epoch checks
[elogind.git] / configure.ac
index ffe648caa49c680eccca55ae462218103422592f..a8b475fa6e8829615fcde11d964fee105efc023e 100644 (file)
@@ -373,22 +373,6 @@ fi
 AM_CONDITIONAL(HAVE_APPARMOR, [test "$have_apparmor" = "yes"])
 
 
-AC_ARG_WITH(debug-shell,
-        AS_HELP_STRING([--with-debug-shell=PATH],
-                [Path to debug shell binary]),
-        [SUSHELL="$withval"],[
-        AS_IF([test "x${have_selinux}" != "xno"], [SUSHELL="/sbin/sushell"] , [SUSHELL="/bin/sh"])])
-
-AC_SUBST(SUSHELL)
-
-AC_ARG_WITH([debug-tty],
-        AS_HELP_STRING([--with-debug-tty=PATH],
-                [Specify the tty device for debug shell]),
-        [DEBUGTTY="$withval"],
-        [DEBUGTTY=/dev/tty9])
-
-AC_SUBST(DEBUGTTY)
-
 AC_ARG_WITH([certificate-root],
         AS_HELP_STRING([--with-certificate-root=PATH],
                 [Specify the prefix for TLS certificates [/etc/ssl]]),
@@ -501,338 +485,6 @@ fi
 
 AM_CONDITIONAL([HAVE_SMACK], [test "x$have_smack" = "xyes"])
 
-# ------------------------------------------------------------------------------
-AC_ARG_ENABLE([gcrypt],
-        AS_HELP_STRING([--disable-gcrypt],[Disable optional GCRYPT support]),
-                [case "${enableval}" in
-                        yes) have_gcrypt=yes ;;
-                        no) have_gcrypt=no ;;
-                        *) AC_MSG_ERROR(bad value ${enableval} for --disable-gcrypt) ;;
-                esac],
-                [have_gcrypt=auto])
-
-if test "x${have_gcrypt}" != xno ; then
-        AM_PATH_LIBGCRYPT(
-                [1.4.5],
-                [have_gcrypt=yes],
-                [if test "x$have_gcrypt" = xyes ; then
-                        AC_MSG_ERROR([*** GCRYPT headers not found.])
-                fi])
-
-        if test "x$have_gcrypt" = xyes ; then
-                GCRYPT_LIBS="$LIBGCRYPT_LIBS"
-                GCRYPT_CFLAGS="$LIBGCRYPT_CFLAGS"
-                AC_DEFINE(HAVE_GCRYPT, 1, [GCRYPT available])
-        else
-                have_gcrypt=no
-        fi
-else
-        GCRYPT_LIBS=
-        GCRYPT_CFLAGS=
-fi
-AC_SUBST(GCRYPT_LIBS)
-AC_SUBST(GCRYPT_CFLAGS)
-AM_CONDITIONAL([HAVE_GCRYPT], [test "x$have_gcrypt" != xno])
-
-# ------------------------------------------------------------------------------
-AC_ARG_ENABLE([audit],
-        AS_HELP_STRING([--disable-audit],[Disable optional AUDIT support]),
-                [case "${enableval}" in
-                        yes) have_audit=yes ;;
-                        no) have_audit=no ;;
-                        *) AC_MSG_ERROR(bad value ${enableval} for --disable-audit) ;;
-                esac],
-                [have_audit=auto])
-
-if test "x${have_audit}" != xno ; then
-        AC_CHECK_HEADERS(
-                [libaudit.h],
-                [have_audit=yes],
-                [if test "x$have_audit" = xyes ; then
-                        AC_MSG_ERROR([*** AUDIT headers not found.])
-                fi])
-
-        AC_CHECK_LIB(
-                [audit],
-                [audit_open],
-                [have_audit=yes],
-                [if test "x$have_audit" = xyes ; then
-                        AC_MSG_ERROR([*** libaudit not found.])
-                fi])
-
-        if test "x$have_audit" = xyes ; then
-                AUDIT_LIBS="-laudit"
-                AC_DEFINE(HAVE_AUDIT, 1, [AUDIT available])
-        else
-                have_audit=no
-        fi
-else
-        AUDIT_LIBS=
-fi
-AC_SUBST(AUDIT_LIBS)
-
-# ------------------------------------------------------------------------------
-AC_ARG_ENABLE([elfutils],
-        AS_HELP_STRING([--disable-elfutils],[Disable optional ELFUTILS support]),
-                [case "${enableval}" in
-                        yes) have_elfutils=yes ;;
-                        no) have_elfutils=no ;;
-                        *) AC_MSG_ERROR(bad value ${enableval} for --disable-elfutils) ;;
-                esac],
-                [have_elfutils=auto])
-
-if test "x${have_elfutils}" != xno ; then
-        AC_CHECK_HEADERS(
-                [elfutils/libdwfl.h],
-                [],
-                [if test "x$have_elfutils" = xyes ; then
-                        AC_MSG_ERROR([*** ELFUTILS headers not found.])
-                fi])
-
-        AC_CHECK_LIB(
-                [dw],
-                [dwfl_begin],
-                [],
-                [if test "x$have_elfutils" = xyes ; then
-                        AC_MSG_ERROR([*** ELFUTILS libs not found.])
-                fi])
-
-        AC_CHECK_LIB(
-                [dw],
-                [dwfl_core_file_attach],
-                [have_elfutils=yes],
-                [if test "x$have_elfutils" = xyes ; then
-                        AC_MSG_ERROR([*** ELFUTILS >= 158 is required.])
-                fi])
-
-        if test "x$have_elfutils" = xyes ; then
-                ELFUTILS_LIBS="-lelf -ldw"
-                AC_DEFINE(HAVE_ELFUTILS, 1, [ELFUTILS available])
-        else
-                have_elfutils=no
-        fi
-else
-        ELFUTILS_LIBS=
-fi
-AC_SUBST(ELFUTILS_LIBS)
-AM_CONDITIONAL(HAVE_ELFUTILS, [test "$have_elfutils" = "yes"])
-
-# ------------------------------------------------------------------------------
-have_libcryptsetup=no
-AC_ARG_ENABLE(libcryptsetup, AS_HELP_STRING([--disable-libcryptsetup], [disable libcryptsetup tools]))
-if test "x$enable_libcryptsetup" != "xno"; then
-        PKG_CHECK_MODULES(LIBCRYPTSETUP, [ libcryptsetup >= 1.6.0 ],
-                [AC_DEFINE(HAVE_LIBCRYPTSETUP, 1, [Define if libcryptsetup is available]) have_libcryptsetup=yes], have_libcryptsetup=no)
-        if test "x$have_libcryptsetup" = xno -a "x$enable_libcryptsetup" = xyes; then
-                AC_MSG_ERROR([*** libcryptsetup support requested but libraries not found])
-        fi
-fi
-AM_CONDITIONAL(HAVE_LIBCRYPTSETUP, [test "$have_libcryptsetup" = "yes"])
-
-# ------------------------------------------------------------------------------
-have_qrencode=no
-AC_ARG_ENABLE(qrencode, AS_HELP_STRING([--disable-qrencode], [disable qrencode support]))
-if test "x$enable_qrencode" != "xno"; then
-        PKG_CHECK_MODULES(QRENCODE, [ libqrencode ],
-                [AC_DEFINE(HAVE_QRENCODE, 1, [Define if qrencode is available]) have_qrencode=yes], have_qrencode=no)
-        if test "x$have_qrencode" = xno -a "x$enable_qrencode" = xyes; then
-                AC_MSG_ERROR([*** qrencode support requested but libraries not found])
-        fi
-fi
-AM_CONDITIONAL(HAVE_QRENCODE, [test "$have_qrencode" = "yes"])
-
-# ------------------------------------------------------------------------------
-have_microhttpd=no
-AC_ARG_ENABLE(microhttpd, AS_HELP_STRING([--disable-microhttpd], [disable microhttpd support]))
-if test "x$enable_microhttpd" != "xno"; then
-        PKG_CHECK_MODULES(MICROHTTPD, [libmicrohttpd >= 0.9.33],
-                [AC_DEFINE(HAVE_MICROHTTPD, 1, [Define if microhttpd is available]) have_microhttpd=yes], have_microhttpd=no)
-        if test "x$have_microhttpd" = xno -a "x$enable_microhttpd" = xyes; then
-                AC_MSG_ERROR([*** microhttpd support requested but libraries not found])
-        fi
-fi
-AM_CONDITIONAL(HAVE_MICROHTTPD, [test "$have_microhttpd" = "yes"])
-
-# ------------------------------------------------------------------------------
-have_gnutls=no
-AC_ARG_ENABLE(gnutls, AS_HELP_STRING([--disable-gnutls], [disable gnutls support]))
-if test "x$enable_gnutls" != "xno"; then
-        PKG_CHECK_MODULES(GNUTLS, [gnutls >= 3.1.4],
-                [AC_DEFINE(HAVE_GNUTLS, 1, [Define if gnutls is available]) have_gnutls=yes], have_gnutls=no)
-        if test "x$have_gnutls" = xno -a "x$enable_gnutls" = xyes; then
-                AC_MSG_ERROR([*** gnutls support requested but libraries not found])
-        fi
-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_libidn=no
-AC_ARG_ENABLE(libidn, AS_HELP_STRING([--disable-libidn], [Disable optional LIBIDN support]))
-if test "x$enable_libidn" != "xno"; then
-        PKG_CHECK_MODULES(LIBIDN, [libidn],
-               [AC_DEFINE(HAVE_LIBIDN, 1, [Define if libidn is available])
-                have_libidn=yes
-                M4_DEFINES="$M4_DEFINES -DHAVE_LIBIDN"],
-               [have_libidn=no])
-        if test "x$have_libidn" = "xno" -a "x$enable_libidn" = "xyes"; then
-                AC_MSG_ERROR([*** libidn support requested but libraries not found])
-        fi
-fi
-AM_CONDITIONAL(HAVE_LIBIDN, [test "$have_libidn" = "yes"])
-
-# ------------------------------------------------------------------------------
-have_binfmt=no
-AC_ARG_ENABLE(binfmt, AS_HELP_STRING([--disable-binfmt], [disable binfmt tool]))
-if test "x$enable_binfmt" != "xno"; then
-        have_binfmt=yes
-fi
-AM_CONDITIONAL(ENABLE_BINFMT, [test "$have_binfmt" = "yes"])
-
-# ------------------------------------------------------------------------------
-have_vconsole=no
-AC_ARG_ENABLE(vconsole, AS_HELP_STRING([--disable-vconsole], [disable vconsole tool]))
-if test "x$enable_vconsole" != "xno"; then
-        have_vconsole=yes
-fi
-AM_CONDITIONAL(ENABLE_VCONSOLE, [test "$have_vconsole" = "yes"])
-
-# ------------------------------------------------------------------------------
-have_bootchart=no
-AC_ARG_ENABLE(bootchart, AS_HELP_STRING([--disable-bootchart], [disable bootchart tool]))
-if test "x$enable_bootchart" != "xno"; then
-        have_bootchart=yes
-fi
-AM_CONDITIONAL(ENABLE_BOOTCHART, [test "$have_bootchart" = "yes"])
-
-# ------------------------------------------------------------------------------
-have_tmpfiles=no
-AC_ARG_ENABLE(tmpfiles, AS_HELP_STRING([--disable-tmpfiles], [disable tmpfiles support]))
-if test "x$enable_tmpfiles" != "xno"; then
-        have_tmpfiles=yes
-fi
-AM_CONDITIONAL(ENABLE_TMPFILES, [test "$have_tmpfiles" = "yes"])
-
-# ------------------------------------------------------------------------------
-have_sysusers=no
-AC_ARG_ENABLE(sysusers, AS_HELP_STRING([--disable-sysusers], [disable sysusers support]))
-if test "x$enable_sysusers" != "xno"; then
-        have_sysusers=yes
-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]))
-if test "x$enable_randomseed" != "xno"; then
-        have_randomseed=yes
-fi
-AM_CONDITIONAL(ENABLE_RANDOMSEED, [test "$have_randomseed" = "yes"])
-
-# ------------------------------------------------------------------------------
-have_backlight=no
-AC_ARG_ENABLE(backlight, AS_HELP_STRING([--disable-backlight], [disable backlight tools]))
-if test "x$enable_backlight" != "xno"; then
-        have_backlight=yes
-fi
-AM_CONDITIONAL(ENABLE_BACKLIGHT, [test "$have_backlight" = "yes"])
-
-# ------------------------------------------------------------------------------
-have_rfkill=no
-AC_ARG_ENABLE(rfkill, AS_HELP_STRING([--disable-rfkill], [disable rfkill tools]))
-if test "x$enable_rfkill" != "xno"; then
-        have_rfkill=yes
-fi
-AM_CONDITIONAL(ENABLE_RFKILL, [test "$have_rfkill" = "yes"])
-
-# ------------------------------------------------------------------------------
-have_logind=no
-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]) ])
-
-# ------------------------------------------------------------------------------
-have_machined=no
-AC_ARG_ENABLE(machined, AS_HELP_STRING([--disable-machined], [disable machine daemon]))
-if test "x$enable_machined" != "xno"; then
-        have_machined=yes
-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]))
-if test "x$enable_hostnamed" != "xno"; then
-        have_hostnamed=yes
-fi
-AM_CONDITIONAL(ENABLE_HOSTNAMED, [test "$have_hostnamed" = "yes"])
-
-# ------------------------------------------------------------------------------
-have_timedated=no
-AC_ARG_ENABLE(timedated, AS_HELP_STRING([--disable-timedated], [disable timedate daemon]))
-if test "x$enable_timedated" != "xno"; then
-        have_timedated=yes
-fi
-AM_CONDITIONAL(ENABLE_TIMEDATED, [test "$have_timedated" = "yes"])
-
-# ------------------------------------------------------------------------------
-have_timesyncd=no
-AC_ARG_ENABLE(timesyncd, AS_HELP_STRING([--disable-timesyncd], [disable timesync daemon]))
-if test "x$enable_timesyncd" != "xno"; then
-        have_timesyncd=yes
-        M4_DEFINES="$M4_DEFINES -DENABLE_TIMESYNCD"
-fi
-AM_CONDITIONAL(ENABLE_TIMESYNCD, [test "$have_timesyncd" = "yes"])
-
-AC_ARG_WITH(ntp-servers,
-        AS_HELP_STRING([--with-ntp-servers=NTPSERVERS],
-                [Space-separated list of default NTP servers]),
-        [NTP_SERVERS="$withval"],
-        [NTP_SERVERS="time1.google.com time2.google.com time3.google.com time4.google.com"])
-
-AC_DEFINE_UNQUOTED(NTP_SERVERS, ["$NTP_SERVERS"], [Default NTP Servers])
-AC_SUBST(NTP_SERVERS)
-
-AC_ARG_WITH(time-epoch,
-        AS_HELP_STRING([--with-time-epoch=SECONDS],
-                [Time epoch for time clients]),
-        [TIME_EPOCH="$withval"],
-        [TIME_EPOCH="`stat -c %Y ${srcdir}/NEWS 2>/dev/null || echo 0`"])
-
-AC_DEFINE_UNQUOTED(TIME_EPOCH, [$TIME_EPOCH], [Time Epoch])
-
 # ------------------------------------------------------------------------------
 AC_ARG_WITH(system-uid-max,
         AS_HELP_STRING([--with-system-uid-max=UID]
@@ -1229,38 +881,12 @@ AC_OUTPUT
 AC_MSG_RESULT([
         $PACKAGE_NAME $VERSION
 
-        libcryptsetup:           ${have_libcryptsetup}
         PAM:                     ${have_pam}
-        AUDIT:                   ${have_audit}
         AppArmor:                ${have_apparmor}
         SELinux:                 ${have_selinux}
         SECCOMP:                 ${have_seccomp}
         SMACK:                   ${have_smack}
         ACL:                     ${have_acl}
-        GCRYPT:                  ${have_gcrypt}
-        QRENCODE:                ${have_qrencode}
-        MICROHTTPD:              ${have_microhttpd}
-        GNUTLS:                  ${have_gnutls}
-        libcurl:                 ${have_libcurl}
-        libidn:                  ${have_libidn}
-        ELFUTILS:                ${have_elfutils}
-        binfmt:                  ${have_binfmt}
-        vconsole:                ${have_vconsole}
-        bootchart:               ${have_bootchart}
-        tmpfiles:                ${have_tmpfiles}
-        sysusers:                ${have_sysusers}
-        firstboot:               ${have_firstboot}
-        randomseed:              ${have_randomseed}
-        backlight:               ${have_backlight}
-        rfkill:                  ${have_rfkill}
-        logind:                  ${have_logind}
-        machined:                ${have_machined}
-        importd:                 ${have_importd}
-        hostnamed:               ${have_hostnamed}
-        timedated:               ${have_timedated}
-        timesyncd:               ${have_timesyncd}
-        default NTP servers:     ${NTP_SERVERS}
-        time epoch:              ${TIME_EPOCH}
         localed:                 ${have_localed}
         networkd:                ${have_networkd}
         resolved:                ${have_resolved}
@@ -1314,7 +940,6 @@ AC_MSG_RESULT([
         Zsh completions dir:     ${with_zshcompletiondir}
         Extra start script:      ${RC_LOCAL_SCRIPT_PATH_START}
         Extra stop script:       ${RC_LOCAL_SCRIPT_PATH_STOP}
-        Debug shell:             ${SUSHELL} @ ${DEBUGTTY}
         TTY GID:                 ${TTY_GID}
         Maximum System UID:      ${SYSTEM_UID_MAX}
         Maximum System GID:      ${SYSTEM_GID_MAX}