diff options
| author | Daniel Borkmann <dborkman@redhat.com> | 2013-07-09 20:16:40 +0200 |
|---|---|---|
| committer | Daniel Borkmann <dborkman@redhat.com> | 2013-07-09 20:20:52 +0200 |
| commit | d4e385dd0e633525666bf95c56a2045bacc2a485 (patch) | |
| tree | a87c451e7f988b65d5a3e350969ca765cff02add /bpf.h | |
| parent | c07bdeb7419baf7f66e8de386744be9ec4891bb3 (diff) | |
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>
Diffstat (limited to 'bpf.h')
| -rw-r--r-- | bpf.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 |