From d4e385dd0e633525666bf95c56a2045bacc2a485 Mon Sep 17 00:00:00 2001
From: Daniel Borkmann <dborkman@redhat.com>
Date: Tue, 9 Jul 2013 20:16:40 +0200
Subject: configure: fix multiple issues in build configuration

This patch is a bundle of multiple fixes.

1) Fix compilation of astraceroute when HAVE_LIBPCAP=1:
   astraceroute doesn't need libpcap, so add an additional
   guard/define to bpf.h and bpf_comp.c and netsniff-ng.c.
   Also since we generate a config.h file, we do not need
   to have this additional compile flag anymore.

2) Fix tstamping.{h,c} to use the configure script instead
   of the Makefile. For doing this, also fix the object
   inclusion in netsniff-ng/Makefile.

Last but not least, rename __WITH_... into HAVE_... as this
is more clean.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
---
 tstamping.c | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'tstamping.c')

diff --git a/tstamping.c b/tstamping.c
index 7c97850..860b7a0 100644
--- a/tstamping.c
+++ b/tstamping.c
@@ -4,14 +4,12 @@
 #include <sys/socket.h>
 #include <linux/sockios.h>
 #include <linux/net_tstamp.h>
-#include <linux/net_tstamp.h>
 #include <linux/if_packet.h>
 #include <linux/if.h>
 
 #include "str.h"
 #include "tstamping.h"
 
-#ifdef __WITH_HARDWARE_TIMESTAMPING
 int set_sockopt_hwtimestamp(int sock, const char *dev)
 {
 	int timesource, ret;
@@ -38,9 +36,3 @@ int set_sockopt_hwtimestamp(int sock, const char *dev)
 	return setsockopt(sock, SOL_PACKET, PACKET_TIMESTAMP, &timesource,
 			  sizeof(timesource));
 }
-#else
-int set_sockopt_hwtimestamp(int sock, const char *dev)
-{
-	return -1;
-}
-#endif
-- 
cgit v1.2.3-54-g00ecf