From: Karel Zak <kzak@redhat.com>
Date: Tue, 10 Mar 2015 10:37:45 +0000 (+0100)
Subject: logger: check for ntp_gettime() rather than for timex.h
X-Git-Tag: v2.27-rc1~379
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d3a07d87fd1c59927a614a04a2751aa4db420d8;p=thirdparty%2Futil-linux.git

logger: check for ntp_gettime() rather than for timex.h

It seems that musl libc and uClibc without UCLIBC_NTP_LEGACY
does not provide ntp_gettime and compile will fail.

References: https://github.com/karelzak/util-linux/issues/174
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/configure.ac b/configure.ac
index 3dcfb74737..cedf761f42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -343,6 +343,7 @@ AC_CHECK_FUNCS([ \
 	lseek64 \
 	mempcpy \
 	nanosleep \
+	ntp_gettime \
 	open_memstream \
 	personality \
 	posix_fadvise \
diff --git a/misc-utils/logger.c b/misc-utils/logger.c
index 0a9e4ab57d..2fd3ddf1dc 100644
--- a/misc-utils/logger.c
+++ b/misc-utils/logger.c
@@ -366,9 +366,6 @@ static void syslog_rfc5424_header(struct logger_ctl *const ctl)
 {
 	char *hostname = NULL;
 	char pid[32], time[64], timeq[80];
-#ifdef HAVE_SYS_TIMEX_H
-	struct ntptimeval ntptv;
-#endif
 	struct timeval tv;
 	struct tm *tm;
 
@@ -408,7 +405,9 @@ static void syslog_rfc5424_header(struct logger_ctl *const ctl)
 		snprintf(pid, sizeof(pid), " %d", ctl->pid);
 
 	if (ctl->rfc5424_tq) {
-#ifdef HAVE_SYS_TIMEX_H
+#ifdef HAVE_NTP_GETTIME
+		struct ntptimeval ntptv;
+
 		if (ntp_gettime(&ntptv) == TIME_OK)
 			snprintf(timeq, sizeof(timeq),
 				 " [timeQuality tzKnown=\"1\" isSynced=\"1\" syncAccuracy=\"%ld\"]",