diff options
| author | Luca Deri <deri@ntop.org> | 2022-01-13 21:15:21 +0100 |
|---|---|---|
| committer | Luca Deri <deri@ntop.org> | 2022-01-13 21:15:21 +0100 |
| commit | 533b3ab0e3041766e2f085e84c63bbd4d31c4b0b (patch) | |
| tree | b173963a6e11b3aa0cace155868fafdcee3fd2cb | |
| parent | 406ac7e8c825ba05bc6371ed3088226bdef21b02 (diff) | |
FreeBSD fixes
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | rrdtool/Makefile.in | 2 | ||||
| -rw-r--r-- | rrdtool/rrd_anomaly.c | 2 | ||||
| -rw-r--r-- | src/include/ndpi_define.h.in | 4 |
4 files changed, 10 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 0abfba487..dc2dc9202 100644 --- a/configure.ac +++ b/configure.ac @@ -170,7 +170,12 @@ case "$host" in if test -f $PCAP_HOME/libpcap/libpcap.a; then : echo "Using libpcap from $PCAP_HOME" PCAP_INC="-I $PCAP_HOME/libpcap" - PCAP_LIB="$PCAP_HOME/libpcap/libpcap.a $PCAP_HOME/lib/libpfring.a $LIBNUMA `$PCAP_HOME/lib/pfring_config --libs`" + PFRING_LIB= + if test -f $PCAP_HOME/lib/libpfring.a; then : + PFRING_LIB=$PCAP_HOME/lib/libpfring.a + fi + + PCAP_LIB="$PCAP_HOME/libpcap/libpcap.a $PFRING_LIB $LIBNUMA `$PCAP_HOME/lib/pfring_config --libs`" AC_CHECK_LIB([rt], [clock_gettime], [PCAP_LIB="$PCAP_LIB -lrt"]) AC_CHECK_LIB([nl], [nl_handle_alloc], [PCAP_LIB="$PCAP_LIB -lnl"]) # The dlopen() function is in libdl on GLIBC-based systems diff --git a/rrdtool/Makefile.in b/rrdtool/Makefile.in index dbc956c1b..cc8998773 100644 --- a/rrdtool/Makefile.in +++ b/rrdtool/Makefile.in @@ -1,5 +1,5 @@ -INC=-I ../src/include +INC=-I ../src/include -I/usr/local/include LIBDPI=../src/lib/libndpi.a LIB=$(LIBDPI) -lrrd -lm @LIBS@ @ADDITIONAL_LIBS@ @LDFLAGS@ diff --git a/rrdtool/rrd_anomaly.c b/rrdtool/rrd_anomaly.c index ae1aa7d55..f50ba9147 100644 --- a/rrdtool/rrd_anomaly.c +++ b/rrdtool/rrd_anomaly.c @@ -22,7 +22,7 @@ #include <stdlib.h> #include <math.h> #include <getopt.h> -#include "rrd.h" +#include <rrd.h> #include "ndpi_api.h" #define DEFAULT_ALPHA 0.5 diff --git a/src/include/ndpi_define.h.in b/src/include/ndpi_define.h.in index d82a7a4f8..605c4b1e5 100644 --- a/src/include/ndpi_define.h.in +++ b/src/include/ndpi_define.h.in @@ -27,8 +27,8 @@ gcc -E -dM - < /dev/null |grep ENDIAN */ -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) -#include <machine/endian.h> +#if defined(__FreeBSD__) || defined(__NetBSD__) +#include <sys/endian.h> #endif #ifdef __OpenBSD__ |