From: Dave Hart <hart@ntp.org>
Date: Tue, 26 Jul 2011 01:59:51 +0000 (+0000)
Subject: Fix build on Linux systems lacking linux/if_addr.h or IFA_F_TENTATIVE.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcdec2485c5999f964f7cd0a3803447abbb85488;p=thirdparty%2Fntp.git

Fix build on Linux systems lacking linux/if_addr.h or IFA_F_TENTATIVE.

bk: 4e2e1f971mz9KJKt3DCJiQBa2GWUnQ
---

diff --git a/lib/isc/unix/interfaceiter.c b/lib/isc/unix/interfaceiter.c
index e25397b38f..996669fc91 100644
--- a/lib/isc/unix/interfaceiter.c
+++ b/lib/isc/unix/interfaceiter.c
@@ -51,7 +51,7 @@
 #endif
 #include <net/if.h>
 
-#ifdef __linux
+#ifdef HAVE_LINUX_IF_ADDR_H
 # include <linux/if_addr.h>
 #endif
 
@@ -225,8 +225,10 @@ linux_if_inet6_current(isc_interfaceiter_t *iter) {
 	** Ignore DAD addresses --
 	** we can't bind to them until they are resolved
 	*/
+#ifdef IFA_F_TENTATIVE
 	if (flags & IFA_F_TENTATIVE)
 		return (ISC_R_IGNORE);
+#endif
 
 	for (i = 0; i < 16; i++) {
 		unsigned char byte;
diff --git a/sntp/m4/ntp_libntp.m4 b/sntp/m4/ntp_libntp.m4
index 55157720b6..d2eb32786b 100644
--- a/sntp/m4/ntp_libntp.m4
+++ b/sntp/m4/ntp_libntp.m4
@@ -142,6 +142,15 @@ typedef union mpinfou {
     esac
 esac
 
+case "$host" in
+ *-linux*)
+    AC_CHECK_HEADERS([linux/if_addr.h], [], [], [
+	#ifdef HAVE_SYS_SOCKET_H
+	# include <sys/socket.h>
+	#endif
+    ])
+esac
+
 AC_CHECK_HEADERS([arpa/nameser.h sys/param.h sys/time.h sys/timers.h])
 # sys/sysctl.h depends on sys/param.h on OpenBSD - Bug 1576
 AC_CHECK_HEADERS([sys/sysctl.h], [], [], [