diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-04-19 16:01:16 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-04-19 16:01:16 +0200 |
| commit | 3e866ec33d27924649acbb6859d7e3d1ddd2423c (patch) | |
| tree | 235513a4e59383e35748f1425829d8cfd85ea4bf | |
| parent | a0ff42a4da79b0885853ca6b528e50b9d20e3c0e (diff) | |
Remove timesyncd check, along with NTP server and epoch checks
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 29 |
2 files changed, 0 insertions, 30 deletions
diff --git a/Makefile.am b/Makefile.am index d18cedcd51..b37225cee0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1003,7 +1003,6 @@ substitutions = \ '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \ '|PYTHON=$(PYTHON)|' \ '|PYTHON_BINARY=$(PYTHON_BINARY)|' \ - '|NTP_SERVERS=$(NTP_SERVERS)|' \ '|DNS_SERVERS=$(DNS_SERVERS)|' \ '|systemuidmax=$(SYSTEM_UID_MAX)|' \ '|systemgidmax=$(SYSTEM_GID_MAX)|' \ diff --git a/configure.ac b/configure.ac index f176484c60..a8b475fa6e 100644 --- a/configure.ac +++ b/configure.ac @@ -486,32 +486,6 @@ fi AM_CONDITIONAL([HAVE_SMACK], [test "x$have_smack" = "xyes"]) # ------------------------------------------------------------------------------ -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] [Maximum UID for system users]), @@ -913,9 +887,6 @@ AC_MSG_RESULT([ SECCOMP: ${have_seccomp} SMACK: ${have_smack} ACL: ${have_acl} - timesyncd: ${have_timesyncd} - default NTP servers: ${NTP_SERVERS} - time epoch: ${TIME_EPOCH} localed: ${have_localed} networkd: ${have_networkd} resolved: ${have_resolved} |