pcre: check for pcre_free_study, fall back to pcre_free if it unavailable

diff --git a/configure.ac b/configure.ac
index 6f8a3b6bdff0af8e4cf4ce770c5d09ab0999cbce..75f044b8b8853d3d442db8a62f09058b5b674cde 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -469,6 +469,14 @@
         echo
     fi
 
+    TMPCFLAGS="${CFLAGS}"
+    CFLAGS="-O0 -g -Werror -Wall"
+    AC_TRY_COMPILE([ #include <pcre.h> ],
+        [ pcre_extra *extra = NULL; pcre_free_study(extra); ],
+        [ AC_DEFINE([HAVE_PCRE_FREE_STUDY], [1], [Pcre pcre_free_study supported])], [:]
+    )
+    CFLAGS="${TMPCFLAGS}"
+
     #enable support for PCRE-jit available since pcre-8.20
     AC_MSG_CHECKING(for PCRE JIT support)
     AC_TRY_COMPILE([ #include <pcre.h> ],

diff --git a/src/suricata-common.h b/src/suricata-common.h
index 9a66ab181203b7eec94e06ee03b7805848b45a02..0d7b691ddd7cae3d00a27efa5d9a3cf90200e204 100644 (file)
--- a/src/suricata-common.h
+++ b/src/suricata-common.h
@@ -270,6 +270,10 @@
 #endif
 #endif
 
+#ifndef HAVE_PCRE_FREE_STUDY
+#define pcre_free_study pcre_free
+#endif
+
 typedef enum PacketProfileDetectId_ {
     PROF_DETECT_MPM,
     PROF_DETECT_MPM_PACKET,         /* PKT MPM */