X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=d6bab84717d18aee808464c3ffc5165e59a93f7c;hp=0f601072f1bc217e05f2221aa8454e3589b0ae7a;hb=aa42cc458b2716fc78aa067cd901a1e049c35cd2;hpb=cfff9fd795c22226df91f6d9b2e31eab70cc11ed diff --git a/configure.ac b/configure.ac index 0f601072f..d6bab8471 100644 --- a/configure.ac +++ b/configure.ac @@ -485,198 +485,6 @@ fi AM_CONDITIONAL([HAVE_SMACK], [test "x$have_smack" = "xyes"]) -# ------------------------------------------------------------------------------ -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] @@ -697,22 +505,6 @@ AC_ARG_WITH(system-gid-max, AC_DEFINE_UNQUOTED(SYSTEM_GID_MAX, [$SYSTEM_GID_MAX], [Maximum System GID]) AC_SUBST(SYSTEM_GID_MAX) -# ------------------------------------------------------------------------------ -have_localed=no -AC_ARG_ENABLE(localed, AS_HELP_STRING([--disable-localed], [disable locale daemon])) -if test "x$enable_localed" != "xno"; then - have_localed=yes -fi -AM_CONDITIONAL(ENABLE_LOCALED, [test "$have_localed" = "yes"]) - -# ------------------------------------------------------------------------------ -have_coredump=no -AC_ARG_ENABLE(coredump, AS_HELP_STRING([--disable-coredump], [disable coredump hook])) -if test "x$enable_coredump" != "xno"; then - have_coredump=yes -fi -AM_CONDITIONAL(ENABLE_COREDUMP, [test "$have_coredump" = "yes"]) - # ------------------------------------------------------------------------------ have_polkit=no AC_ARG_ENABLE(polkit, AS_HELP_STRING([--disable-polkit], [disable PolicyKit support])) @@ -740,82 +532,6 @@ AC_ARG_WITH(dns-servers, AC_DEFINE_UNQUOTED(DNS_SERVERS, ["$DNS_SERVERS"], [Default DNS Servers]) AC_SUBST(DNS_SERVERS) -# ------------------------------------------------------------------------------ -have_networkd=no -AC_ARG_ENABLE(networkd, AS_HELP_STRING([--disable-networkd], [disable networkd])) -AS_IF([test "x$enable_networkd" != "xno"], [ - AC_DEFINE(ENABLE_NETWORKD, 1, [Define if networkd support is to be enabled]) - have_networkd=yes - M4_DEFINES="$M4_DEFINES -DENABLE_NETWORKD" -]) -AM_CONDITIONAL(ENABLE_NETWORKD, [test "x$have_networkd" = "xyes"]) - -# ------------------------------------------------------------------------------ -have_efi=no -AC_ARG_ENABLE(efi, AS_HELP_STRING([--disable-efi], [disable EFI support])) -if test "x$enable_efi" != "xno"; then - AC_DEFINE(ENABLE_EFI, 1, [Define if EFI support is to be enabled]) - have_efi=yes -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]) - # ------------------------------------------------------------------------------ have_kdbus=no AC_ARG_ENABLE(kdbus, AS_HELP_STRING([--enable-kdbus], [do connect to kdbus by default])) @@ -1079,41 +795,9 @@ AC_MSG_RESULT([ SECCOMP: ${have_seccomp} SMACK: ${have_smack} ACL: ${have_acl} - MICROHTTPD: ${have_microhttpd} - GNUTLS: ${have_gnutls} - libcurl: ${have_libcurl} - libidn: ${have_libidn} - 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} default DNS servers: ${DNS_SERVERS} - 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} blkid: ${have_blkid} dbus: ${have_dbus} nss-myhostname: ${have_myhostname}