From f9bd7d29ced8e596aeaab2258bc7f56f14521a2e Mon Sep 17 00:00:00 2001
From: Toni Uhlig <matzeton@googlemail.com>
Date: Tue, 6 Sep 2022 14:50:46 +0200
Subject: Bump libnDPI to 37f918322c0a489b5143a987c8f1a44a6f78a6f3 and updated
 flow json schema file.

 * export env vars AR / CMAKE_C_COMPILER_AR and RANLIB / CMAKE_C_COMPILER_RANLIB while building libnDPI
 * nDPId check API version during startup (macro vs. function call) and print a warning if they are different

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
---
 scripts/get-and-build-libndpi.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/get-and-build-libndpi.sh b/scripts/get-and-build-libndpi.sh
index f9851c852..518ae820a 100755
--- a/scripts/get-and-build-libndpi.sh
+++ b/scripts/get-and-build-libndpi.sh
@@ -14,6 +14,8 @@ cat <<EOF
 ------ environment variables ------
 CC=${CC:-}
 CXX=${CXX:-}
+AR=${AR:-}
+RANLIB=${RANLIB:-}
 PKG_CONFIG=${PKG_CONFIG:-}
 CFLAGS=${CFLAGS:-}
 LDFLAGS=${LDFLAGS:-}
@@ -40,7 +42,10 @@ if [ ! -z "${CROSS_COMPILE_TRIPLET}" ]; then
 else
     HOST_ARG=""
 fi
-./autogen.sh --enable-option-checking=fatal --prefix="${DEST_INSTALL}" --with-only-libndpi ${HOST_ARG} ${ADDITIONAL_ARGS}
+./autogen.sh --enable-option-checking=fatal \
+    --prefix="${DEST_INSTALL}" --exec-prefix="${DEST_INSTALL}" \
+    --includedir="${DEST_INSTALL}/include" --libdir="${DEST_INSTALL}/lib" \
+    --with-only-libndpi ${HOST_ARG} ${ADDITIONAL_ARGS}
 ${MAKE_PROGRAM} install
 
 rm -f "${LOCKFILE}"
-- 
cgit v1.2.3