diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-04-19 16:13:11 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-04-19 16:13:11 +0200 |
| commit | 11daed7de4fdadb3ca98ec8a6ef9080e66fe56fc (patch) | |
| tree | 5825fcccf72cd3a0c88f5d8d7e2b92425b2d97e3 | |
| parent | aa42cc458b2716fc78aa067cd901a1e049c35cd2 (diff) | |
Remove resolved check and default DNS servers
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 20 |
2 files changed, 0 insertions, 21 deletions
diff --git a/Makefile.am b/Makefile.am index a334c5e9ca..8e518b3be1 100644 --- 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 d6bab84717..de36102070 100644 --- a/configure.ac +++ b/configure.ac @@ -515,24 +515,6 @@ 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])) if test "x$enable_kdbus" = "xyes"; then @@ -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} |