Skip to content

Miscellaneous build system patches #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Miscellaneous build system patches #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dde6c39
build: fix bashism in configure
thesamesam Feb 8, 2022
ac95396
build: make NUMA support optional
thesamesam Feb 8, 2022
5e4a8f9
build: use pkg-config to find ncurses
thesamesam Feb 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions configure.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ AC_PROG_INSTALL
AC_CHECK_PROGS(YACC, 'bison -y' byacc yacc)
AM_PROG_LEX

PKG_PROG_PKG_CONFIG

# All our source files for function replacements are in lib/
AC_CONFIG_LIBOBJ_DIR(lib)

Expand Down Expand Up @@ -305,7 +307,7 @@ AC_ARG_WITH(xdp, AS_HELP_STRING(--with-xdp, include XDP capture support),

if test "$want_xdp" != no; then
AC_CHECK_LIB(elf, elf_begin, elffound=1, elffound=0)
if test "$elffound" == 1; then
if test "$elffound" = 1; then
# check for libbpf
AC_CHECK_LIB(bpf, xsk_socket__create, bpffound=1, bpffound=0, -lelf)

Expand Down Expand Up @@ -518,7 +520,23 @@ AC_CHECK_DECL([PACKET_FANOUT],
[[#include <linux/if_packet.h>]])

# If we use DPDK we might be able to use libnuma
AC_CHECK_LIB(numa, numa_node_to_cpus, have_numa=1, have_numa=0)
AC_ARG_WITH(numa,
AS_HELP_STRING(--without-numa,disable NUMA support),
[
if test "$withval" = no
then
want_numa=no
else
want_numa=yes
fi
],[
# Default to building with NUMA
want_numa=yes
])

if test "$want_numa" != no; then
AC_CHECK_LIB(numa, numa_node_to_cpus, have_numa=1, have_numa=0)
fi

# Need libwandder for ETSI live decoding
AC_CHECK_LIB(wandder, init_wandder_decoder, have_wandder=1, have_wandder=0)
Expand Down Expand Up @@ -900,6 +918,8 @@ if (test "$use_llvm" != "no"); then
fi
fi

PKG_CHECK_MODULES(ncurses,ncurses,have_ncurses=yes,have_ncurses=no)

AC_ARG_WITH([ncurses],
AC_HELP_STRING([--with-ncurses], [build tracetop (requires ncurses)]))

Expand Down
2 changes: 1 addition & 1 deletion tools/tracetop/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ bin_PROGRAMS = tracetop
include ../Makefile.tools

tracetop_SOURCES = tracetop.cc
tracetop_LDADD = -lncurses
tracetop_LDADD = @ncurses_LIBS@
tracetop_CPPFLAGS = -fno-strict-aliasing $(AM_CFLAGS)
endif