X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=a8b475fa6e8829615fcde11d964fee105efc023e;hp=6924e01a1c496d25bc39bd2b9d98691e1ed38935;hb=3e866ec33d27924649acbb6859d7e3d1ddd2423c;hpb=c1bf4024a16291b4371333db2b86bd1e1d227e13 diff --git a/configure.ac b/configure.ac index 6924e01a1..a8b475fa6 100644 --- a/configure.ac +++ b/configure.ac @@ -485,174 +485,6 @@ fi AM_CONDITIONAL([HAVE_SMACK], [test "x$have_smack" = "xyes"]) -# ------------------------------------------------------------------------------ -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] @@ -1055,25 +887,6 @@ AC_MSG_RESULT([ SECCOMP: ${have_seccomp} SMACK: ${have_smack} ACL: ${have_acl} - 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}