Revert "Adds suppor for HyperScan in the bulid system"

This reverts commit 912704b.

Author: zimmerle

build/hyperscan.m4

@@ -78,10 +78,6 @@ AC_DEFUN([LIBINJECTION_VERSION], m4_esyscmd_s(cd "others/libinjection" && git de
 # SecLang test version
 AC_DEFUN([SECLANG_TEST_VERSION], m4_esyscmd_s(cd "test/test-cases/secrules-language-tests" && git log -1 --format="%h" --abbrev-commit && cd ../../..))
 
-# Check for hyperscan
-PROG_HS
-AM_CONDITIONAL([HS_VERSION], [test "$HS_VERSION" != ""])
-
 
 # Check for yajl
 PROG_YAJL
@@ -557,22 +553,6 @@ if test "x$LUA_FOUND" = "x2"; then
     echo "   + LUA                                           ....disabled"
 fi
 
-## HyperScan
-if test "x$HS_FOUND" = "x0"; then
-    echo "   + HyperScan                                     ....not found"
-fi
-if test "x$HS_FOUND" = "x1"; then
-    echo -n "   + HyperScan                                     ....found "
-    if ! test "x$HS_VERSION" = "x"; then
-        echo "v${HS_VERSION}"
-    else
-        echo ""
-    fi
-    echo "      ${HS_DISPLAY}"
-fi
-if test "x$HS_FOUND" = "x2"; then
-    echo "   + HyperScan                                     ....disabled"
-fi
 
 echo " "
 echo " Other Options"

configure.ac

@@ -9,8 +9,7 @@ multi_LDADD = \
 	$(SSDEEP_LDADD) \
 	$(LUA_LDADD) \
 	$(MAXMIND_LDADD) \
-	$(GLOBAL_LDADD) \
-	$(HS_LDADD)
+	$(GLOBAL_LDADD)
 
 multi_LDFLAGS = \
 	-L$(top_builddir)/src/.libs/ \
@@ -22,7 +21,6 @@ multi_LDFLAGS = \
 	$(LUA_LDFLAGS) \
 	$(SSDEEP_LDFLAGS) \
 	$(MAXMIND_LDFLAGS) \
-	$(HS_LDFLAGS) \
 	$(YAJL_LDFLAGS)
 
 multi_CFLAGS = \

examples/multiprocess_c/Makefile.am

@@ -15,8 +15,7 @@ simple_request_LDADD = \
 	$(LUA_LDADD) \
 	$(PCRE_LDADD) \
 	$(SSDEEP_LDADD) \
-	$(YAJL_LDADD) \
-	$(HS_LDADD)
+	$(YAJL_LDADD)
 
 simple_request_LDFLAGS = \
 	-L$(top_builddir)/src/.libs/ \
@@ -29,7 +28,6 @@ simple_request_LDFLAGS = \
 	$(LUA_LDFLAGS) \
 	$(MAXMIND_LDFLAGS) \
 	$(SSDEEP_LDFLAGS) \
-	$(HS_LDFLAGS) \
 	$(YAJL_LDFLAGS)
 
 simple_request_CPPFLAGS = \
@@ -46,7 +44,6 @@ simple_request_CPPFLAGS = \
 	$(GLOBAL_CPPFLAGS) \
 	$(MODSEC_NO_LOGS) \
 	$(YAJL_CFLAGS) \
-	$(HS_CFLAGS) \
 	$(LMDB_CFLAGS) \
 	$(LUA_CFLAGS) \
 	$(PCRE_CFLAGS) \

examples/reading_logs_via_rule_message/Makefile.am

@@ -15,7 +15,6 @@ read_LDADD = \
 	$(LUA_LDADD) \
 	$(PCRE_LDADD) \
 	$(SSDEEP_LDADD) \
-	$(HS_LDADD) \
 	$(YAJL_LDADD)
 
 read_LDFLAGS = \
@@ -29,7 +28,6 @@ read_LDFLAGS = \
 	$(LUA_LDFLAGS) \
 	$(SSDEEP_LDFLAGS) \
 	$(MAXMIND_LDFLAGS) \
-	$(HS_LDFLAGS) \
 	$(YAJL_LDFLAGS)
 
 read_CPPFLAGS = \
@@ -50,7 +48,6 @@ read_CPPFLAGS = \
 	$(LMDB_CFLAGS) \
 	$(LUA_CFLAGS) \
 	$(PCRE_CFLAGS) \
-	$(HS_CFLAGS) \
 	$(LIBXML2_CFLAGS)
 
 

examples/reading_logs_with_offset/Makefile.am

@@ -8,7 +8,6 @@ test_SOURCES = \
 test_LDADD = \
 	$(GLOBAL_LDADD) \
 	$(LUA_LDADD) \
-	$(HS_LDADD) \
 	$(SSDEEP_LDADD)
 
 test_LDFLAGS = \
@@ -19,7 +18,6 @@ test_LDFLAGS = \
 	-lstdc++ \
 	$(LUA_LDFLAGS) \
 	$(SSDEEP_LDFLAGS) \
-	$(HS_LDFLAGS) \
 	$(YAJL_LDFLAGS)
 
 test_CFLAGS = \

examples/simple_example_using_c/Makefile.am

@@ -15,7 +15,6 @@ simple_request_LDADD = \
 	$(LUA_LDADD) \
 	$(PCRE_LDADD) \
 	$(SSDEEP_LDADD) \
-	$(HS_LDADD) \
 	$(YAJL_LDADD)
 
 simple_request_LDFLAGS = \
@@ -30,7 +29,6 @@ simple_request_LDFLAGS = \
 	-lpthread \
 	$(LUA_LDFLAGS) \
 	$(SSDEEP_LDFLAGS) \
-	$(HS_LDFLAGS) \
 	$(YAJL_LDFLAGS)
 
 simple_request_CPPFLAGS = \
@@ -51,7 +49,6 @@ simple_request_CPPFLAGS = \
 	$(LMDB_CFLAGS) \
 	$(LUA_CFLAGS) \
 	$(PCRE_CFLAGS) \
-	$(HS_CFLAGS) \
 	$(LIBXML2_CFLAGS)
 
 MAINTAINERCLEANFILES = \

examples/using_bodies_in_chunks/Makefile.am

@@ -326,7 +326,6 @@ libmodsecurity_la_CPPFLAGS = \
 	$(SSDEEP_CFLAGS) \
 	$(MAXMIND_CFLAGS) \
 	$(LUA_CFLAGS) \
-	$(HS_CFLAGS) \
 	$(LIBXML2_CFLAGS)
 
 
@@ -342,7 +341,6 @@ libmodsecurity_la_LDFLAGS = \
 	$(SSDEEP_LDFLAGS) \
 	$(MAXMIND_LDFLAGS) \
 	$(YAJL_LDFLAGS) \
-	$(HS_LDFLAGS) \
 	-version-info @MSC_VERSION_INFO@
 
 
@@ -358,6 +356,5 @@ libmodsecurity_la_LIBADD = \
 	$(PCRE_LDADD) \
 	$(MAXMIND_LDADD) \
 	$(SSDEEP_LDADD) \
-	$(HS_LDADD) \
 	$(YAJL_LDADD)