Remove resolved check and default DNS servers

diff --git a/Makefile.am b/Makefile.am
index a334c5e9ca3792026311e0431078a77ffe0e570e..8e518b3be1a5859350c47bf376a3f63f64b6e281 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -999,7 +999,6 @@ substitutions = \
        '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \
        '|PYTHON=$(PYTHON)|' \
        '|PYTHON_BINARY=$(PYTHON_BINARY)|' \
-       '|DNS_SERVERS=$(DNS_SERVERS)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
        '|systemgidmax=$(SYSTEM_GID_MAX)|' \
        '|TTY_GID=$(TTY_GID)|' \

diff --git a/configure.ac b/configure.ac
index d6bab84717d18aee808464c3ffc5165e59a93f7c..de361020702dad8d26d2b26e412c260f4d25fb48 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -514,24 +514,6 @@ if test "x$enable_polkit" != "xno"; then
 fi
 AM_CONDITIONAL(ENABLE_POLKIT, [test "x$have_polkit" = "xyes"])
 
-# ------------------------------------------------------------------------------
-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
-        M4_DEFINES="$M4_DEFINES -DENABLE_RESOLVED"
-fi
-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"],
-        [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_kdbus=no
 AC_ARG_ENABLE(kdbus, AS_HELP_STRING([--enable-kdbus], [do connect to kdbus by default]))
@@ -795,8 +777,6 @@ AC_MSG_RESULT([
         SECCOMP:                 ${have_seccomp}
         SMACK:                   ${have_smack}
         ACL:                     ${have_acl}
-        resolved:                ${have_resolved}
-        default DNS servers:     ${DNS_SERVERS}
         polkit:                  ${have_polkit}
         blkid:                   ${have_blkid}
         dbus:                    ${have_dbus}