From 51f5fc714015c312622ed4ee1820518d26edee65 Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Mon, 25 Mar 2024 08:15:19 +0100 Subject: Added support for roaring bitmap v3 (#2355) * Integrated RoaringBitmap v3 * Renamed ndpi_bitmap64 ro ndpi_bitmap64_fuse * Fixes to ndpi_bitmap for new roaring library * Fixes for bitmap serialization * Fixed format * Warning fix * Conversion fix * Warning fix * Added check for roaring v3 support * Updated file name * Updated path * Uses clang-9 (instead of clang-7) for builds * Fixed fuzz_ds_bitmap64_fuse * Fixes nDPI printf handling * Disabled printf * Yet another printf fix * Cleaup * Fx for compiling on older platforms * Fixes for old compilers * Initialization changes * Added compiler check * Fixes for old compilers * Inline function is not static inline * Added missing include --- configure.ac | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 94b379f7a..737e1e430 100644 --- a/configure.ac +++ b/configure.ac @@ -120,6 +120,25 @@ AC_CHECK_TOOL(AR, ar, [false]) AC_LANG_WERROR +AC_MSG_CHECKING([whether roaring v3 works]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #if __has_include () + #endif + ]])], + [ + AC_MSG_RESULT([yes]) + ], + [ + AC_MSG_RESULT([no]) + AC_DEFINE_UNQUOTED(USE_ROARING_V2, "1", [Use CRoaring 2.1.x]) + ]) + +GCC_VERSION=`gcc --version | cut -d ' ' -f 3 | head -1|cut -d '.' -f 1` +if [ "${GCC_VERSION}" -lt "7" ]; then + AC_DEFINE_UNQUOTED(USE_ROARING_V2, "1", [Use CRoaring 2.1.x]) +fi + + NDPI_MAJOR=`echo "${PACKAGE_VERSION}" | cut -d . -f 1` NDPI_MINOR=`echo "${PACKAGE_VERSION}" | cut -d . -f 2` NDPI_PATCH=`echo "${PACKAGE_VERSION}" | cut -d . -f 3` -- cgit v1.2.3