From d4e385dd0e633525666bf95c56a2045bacc2a485 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann 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 --- netsniff-ng/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'netsniff-ng') diff --git a/netsniff-ng/Makefile b/netsniff-ng/Makefile index e05ad1d..2f64c0f 100644 --- a/netsniff-ng/Makefile +++ b/netsniff-ng/Makefile @@ -57,7 +57,6 @@ netsniff-ng-objs = dissector.o \ ring_tx.o \ ring.o \ tprintf.o \ - tstamping.o \ timer.o \ geoip.o \ mac80211.o \ @@ -66,3 +65,6 @@ netsniff-ng-objs = dissector.o \ ifeq ($(CONFIG_LIBPCAP), 1) netsniff-ng-objs += bpf_comp.o endif +ifeq ($(CONFIG_HWTSTAMP), 1) +netsniff-ng-objs += tstamping.o +endif -- cgit v1.2.3-54-g00ecf