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 --- bpf.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bpf.h') diff --git a/bpf.h b/bpf.h index 1f6b21c..d63205e 100644 --- a/bpf.h +++ b/bpf.h @@ -8,6 +8,7 @@ #include "xmalloc.h" #include "bpf_insns.h" #include "bpf_ext.h" +#include "config.h" extern void bpf_dump_op_table(void); extern void bpf_dump_all(struct sock_fprog *bpf); @@ -18,7 +19,7 @@ extern void bpf_attach_to_sock(int sock, struct sock_fprog *bpf); extern void bpf_detach_from_sock(int sock); extern int enable_kernel_bpf_jit_compiler(void); extern void bpf_parse_rules(char *rulefile, struct sock_fprog *bpf, uint32_t link_type); -#ifdef __WITH_TCPDUMP_LIKE_FILTER +#if defined(HAVE_TCPDUMP_LIKE_FILTER) && defined(NEED_TCPDUMP_LIKE_FILTER) extern void bpf_try_compile(const char *rulefile, struct sock_fprog *bpf, uint32_t link_type); #else -- cgit v1.2.3-54-g00ecf