diff --git a/autoconf/config.h.in b/autoconf/config.h.in
index 03542474a61..f335a70046d 100644
--- a/autoconf/config.h.in
+++ b/autoconf/config.h.in
@@ -132,6 +132,9 @@
 /* Define to 1 if you have the `closefrom' function. */
 #undef HAVE_CLOSEFROM
 
+/* Define to 1 if you have compressBound */
+#undef HAVE_COMPRESS_BOUND
+
 /* Define to 1 if Bareos conio support enabled */
 #undef HAVE_CONIO
 
@@ -219,6 +222,9 @@
 /* Set if you have an Embedded MySQL Database */
 #undef HAVE_EMBEDDED_MYSQL
 
+/* Define to 1 if OpenSSL library has ENGINE_load_pk11 available */
+#undef HAVE_ENGINE_LOAD_PK11
+
 /* Define to 1 if you have the <execinfo.h> header file. */
 #undef HAVE_EXECINFO_H
 
@@ -553,6 +559,9 @@
 /* Define to 1 if you have the <nl_types.h> header file. */
 #undef HAVE_NL_TYPES_H
 
+/* Define to 1 to when walkcontext does not work */
+#undef HAVE_NON_WORKING_WALKCONTEXT
+
 /* Define to 1 if you have the `nvlist_next_nvpair' function. */
 #undef HAVE_NVLIST_NEXT_NVPAIR
 
diff --git a/configure b/configure
index 49e6af0e3b2..13c023f21ee 100755
--- a/configure
+++ b/configure
@@ -23399,6 +23399,32 @@ if test "x$support_crypto" != "xno" -o "x$support_tls" != "xno"; then
       CFLAGS="${saved_CFLAGS} ${OPENSSL_INC}"
       CPPFLAGS="${saved_CPPFLAGS} ${OPENSSL_INC}"
 
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+	     #include <openssl/engine.h>
+
+int
+main ()
+{
+
+	      ENGINE_load_pk11();
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+
+$as_echo "#define HAVE_ENGINE_LOAD_PK11 1" >>confdefs.h
+
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -29909,6 +29935,41 @@ fi
 done
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compressBound in zlib library" >&5
+$as_echo_n "checking for compressBound in zlib library... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+       #include <zlib.h>
+
+int
+main ()
+{
+
+       compressBound(0);
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_COMPRESS_BOUND 1" >>confdefs.h
+
+
+else
+
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in zlib library" >&5
 $as_echo_n "checking for deflate in zlib library... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -31920,11 +31981,22 @@ $as_echo "#define HAVE_OLD_SOCKOPT 1" >>confdefs.h
 
 $as_echo "#define USE_THR_SETCONCURRENCY 1" >>confdefs.h
 
+
+$as_echo "#define HAVE_NON_WORKING_WALKCONTEXT 1" >>confdefs.h
+
       ;;
    5.7|5.8)
 
 $as_echo "#define USE_THR_SETCONCURRENCY 1" >>confdefs.h
 
+
+$as_echo "#define HAVE_NON_WORKING_WALKCONTEXT 1" >>confdefs.h
+
+      ;;
+   5.9)
+
+$as_echo "#define HAVE_NON_WORKING_WALKCONTEXT 1" >>confdefs.h
+
       ;;
    *)
       ;;