diff options
| author | Tom Gundersen <teg@jklm.no> | 2014-05-18 22:10:48 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2014-05-19 18:14:56 +0200 |
| commit | 091a364c802e34a58f3260c9cb5db9b75c62215c (patch) | |
| tree | 35b22463dde65c3fcaec38653fe757ae30152b15 /configure.ac | |
| parent | 7dbf94a9c4dcdf9b56384e66eb2652fb61da5063 (diff) | |
| download | systemd-091a364c802e34a58f3260c9cb5db9b75c62215c.tar.gz | |
resolved: add daemon to manage resolv.conf
Also remove the equivalent functionality from networkd.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 469fc2d942..9a849ffe7b 100644 --- a/configure.ac +++ b/configure.ac @@ -879,26 +879,34 @@ fi AM_CONDITIONAL(ENABLE_POLKIT, [test "x$have_polkit" = "xyes"]) # ------------------------------------------------------------------------------ -have_networkd=no -AC_ARG_ENABLE(networkd, AS_HELP_STRING([--disable-networkd], [disable networkd])) -if test "x$enable_networkd" != "xno"; then - AC_DEFINE(ENABLE_NETWORKD, 1, [Define if networkd support is to be enabled]) - have_networkd=yes +have_resolved=no +AC_ARG_ENABLE(resolved, AS_HELP_STRING([--disable-resolved], [disable resolve daemon])) +if test "x$enable_resolved" != "xno"; then + have_resolved=yes fi -AS_IF([test "x$have_networkd" = "xyes" -a "x$have_kmod" != "xyes"], - [AC_MSG_ERROR([networkd requires kmod])]) -AM_CONDITIONAL(ENABLE_NETWORKD, [test "x$have_networkd" = "xyes"]) +AM_CONDITIONAL(ENABLE_RESOLVED, [test "$have_resolved" = "yes"]) AC_ARG_WITH(dns-servers, AS_HELP_STRING([--with-dns-servers=DNSSERVERS], [Space-separated list of default DNS servers]), - [DNS_SERVERS="$withval"], + [NTP_SERVERS="$withval"], [DNS_SERVERS="8.8.8.8 8.8.4.4 2001:4860:4860::8888 2001:4860:4860::8844"]) 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])) +if test "x$enable_networkd" != "xno"; then + AC_DEFINE(ENABLE_NETWORKD, 1, [Define if networkd support is to be enabled]) + have_networkd=yes +fi +AS_IF([test "x$have_networkd" = "xyes" -a "x$have_kmod" != "xyes"], + [AC_MSG_ERROR([networkd requires kmod])]) +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 @@ -1201,6 +1209,7 @@ AC_MSG_RESULT([ time epoch: ${TIME_EPOCH} localed: ${have_localed} networkd: ${have_networkd} + resolved: ${have_resolved} default DNS servers: ${DNS_SERVERS} coredump: ${have_coredump} polkit: ${have_polkit} |