From 6ac83ce7eb9961785bb2b7ba4c3788524591b30f Mon Sep 17 00:00:00 2001
From: Simone Mainardi <mainardi@ntop.org>
Date: Tue, 11 Sep 2018 10:43:04 +0200
Subject: Fixes broken hyperscan compilation

---
 configure.seed              | 1 +
 example/Makefile.in         | 2 +-
 src/include/ndpi_typedefs.h | 2 ++
 src/lib/ndpi_main.c         | 4 ----
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/configure.seed b/configure.seed
index 8f8817f24..548cffc83 100644
--- a/configure.seed
+++ b/configure.seed
@@ -74,6 +74,7 @@ if test "${with_hyperscan+set}" = set; then
           AC_CHECK_LIB([stdc++], [main])
           HS_INC=`pkg-config --cflags libhs`
           HS_LIB=`pkg-config --libs libhs`
+          LDFLAGS="$LDFLAGS $HS_LIB"
      else
           AC_MSG_RESULT([Intel Hyperscan not found, exiting. See https://github.com/intel/hyperscan/blob/master/doc/dev-reference/getting_started.rst for install/build instructions])
           exit 1
diff --git a/example/Makefile.in b/example/Makefile.in
index b515fa42a..7f465bdde 100644
--- a/example/Makefile.in
+++ b/example/Makefile.in
@@ -7,7 +7,7 @@ OBJS=ndpiReader.o ndpi_util.o
 all: ndpiReader
 
 ndpiReader: $(OBJS) $(LIBNDPI)
-	$(CC) $(CFLAGS) $(OBJS) -o $@ $(LDFLAGS)
+	$(CXX) $(CFLAGS) $(OBJS) -o $@ $(LDFLAGS)
 
 %.o: %.c $(HEADERS) Makefile
 	$(CC) $(CFLAGS) -c $< -o $@
diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h
index c4df5b030..385c330f4 100644
--- a/src/include/ndpi_typedefs.h
+++ b/src/include/ndpi_typedefs.h
@@ -858,6 +858,8 @@ typedef struct ndpi_proto {
 #include "ndpi_config.h"
 
 #ifdef HAVE_HYPERSCAN
+#include <hs/hs.h>
+
 struct hs_list {
     char *expression;
     unsigned int id;
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index b00225c7c..b4fa7a9bc 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -47,10 +47,6 @@
 #include "third_party/include/hash.h"
 /* #include "third_party/src/hash.c" */
 
-#ifdef HAVE_HYPERSCAN
-#include <hs/hs.h>
-#endif
-
 #define NDPI_CONST_GENERIC_PROTOCOL_NAME  "GenericProtocol"
 
 static int _ndpi_debug_callbacks = 0;
-- 
cgit v1.2.3