@@ -635,7 +635,9 @@ ac_includes_default="\

 #endif"

 enable_option_checking=no

-ac_subst_vars='ENABLE_YARA_FALSE

+ac_subst_vars='ENABLE_CLAMSUBMIT_FALSE

+ENABLE_CLAMSUBMIT_TRUE

+ENABLE_YARA_FALSE

 ENABLE_YARA_TRUE

 ENABLE_LLVM_FALSE

 ENABLE_LLVM_TRUE

@@ -692,8 +694,6 @@ LIBPRELUDE_CFLAGS

 LIBPRELUDE_CONFIG

 ENABLE_LIBFRESHCLAM_FALSE

 ENABLE_LIBFRESHCLAM_TRUE

-ENABLE_CLAMSUBMIT_FALSE

-ENABLE_CLAMSUBMIT_TRUE

 HAVE_YARA

 subdirs

 llvmconfig

@@ -18718,9 +18718,9 @@ then

     as_fn_error $? "Please install zlib and zlib-devel packages" "$LINENO" 5

 else

-    vuln=`grep "ZLIB_VERSION \"1.2.0" $ZLIB_HOME/include/zlib.h`

+    vuln=`grep "ZLIB_VERSION \"1.2.0\"" $ZLIB_HOME/include/zlib.h`

     if test -z "$vuln"; then

-	vuln=`grep "ZLIB_VERSION \"1.2.1" $ZLIB_HOME/include/zlib.h`

+	vuln=`grep "ZLIB_VERSION \"1.2.1\"" $ZLIB_HOME/include/zlib.h`

     fi

     if test -n "$vuln"; then

@@ -24609,13 +24609,6 @@ fi

- if test "$have_curl" = "yes"; then

-  ENABLE_CLAMSUBMIT_TRUE=

-  ENABLE_CLAMSUBMIT_FALSE='#'

-else

-  ENABLE_CLAMSUBMIT_TRUE='#'

-  ENABLE_CLAMSUBMIT_FALSE=

-fi

 # Check whether --with-system-libmspack was given.

@@ -27309,6 +27302,14 @@ else

   ENABLE_YARA_FALSE=

 fi

+ if test "X$have_curl" = "Xyes" && test "X$have_json" = "Xyes"; then

+  ENABLE_CLAMSUBMIT_TRUE=

+  ENABLE_CLAMSUBMIT_FALSE='#'

+else

+  ENABLE_CLAMSUBMIT_TRUE='#'

+  ENABLE_CLAMSUBMIT_FALSE=

+fi

+

 no_recursion="yes";

 ac_config_files="$ac_config_files libclamav/Makefile"

@@ -27544,6 +27545,10 @@ if test -z "${ENABLE_YARA_TRUE}" && test -z "${ENABLE_YARA_FALSE}"; then

   as_fn_error $? "conditional \"ENABLE_YARA\" was never defined.

 Usually this means the macro was only invoked conditionally." "$LINENO" 5

 fi

+if test -z "${ENABLE_CLAMSUBMIT_TRUE}" && test -z "${ENABLE_CLAMSUBMIT_FALSE}"; then

+  as_fn_error $? "conditional \"ENABLE_CLAMSUBMIT\" was never defined.

+Usually this means the macro was only invoked conditionally." "$LINENO" 5

+fi

 : "${CONFIG_STATUS=./config.status}"

 ac_write_fail=0

@@ -29993,19 +29998,35 @@ else

   $as_echo "yes ($have_milter)"

 fi

+if test "X$have_curl" = "Xyes" && test "X$have_json" = "Xyes"; then

    $as_echo_n "              clamsubmit  : "

-   if test "x$curl_msg" = "xno"; then :

-  $as_echo "$have_curl (disabled)"

-elif test "x$curl_msg" = "xyes"; then :

-  $as_echo "$have_curl"

-elif test "x$curl_msg" = "x"; then :

-  $as_echo "$have_curl"

+   if test "xyes" = "xno"; then :

+  $as_echo "yes (disabled)"

+elif test "xyes" = "xyes"; then :

+  $as_echo "yes"

+elif test "xyes" = "x"; then :

+  $as_echo "yes"

 else

-  $as_echo "$have_curl ($curl_msg)"

+  $as_echo "yes (yes)"

 fi

+else

+

+

+   $as_echo_n "              clamsubmit  : "

+   if test "xno" = "xno"; then :

+  $as_echo "no (disabled)"

+elif test "xno" = "xyes"; then :

+  $as_echo "no"

+elif test "xno" = "x"; then :

+  $as_echo "no"

+else

+  $as_echo "no (no)"

+fi

+

+fi

 { $as_echo "$as_me:${as_lineno-$LINENO}: Summary of engine performance features" >&5

 $as_echo "$as_me: Summary of engine performance features" >&6;}

@@ -199,6 +199,8 @@ AM_CONDITIONAL([ENABLE_LLVM],

 	       [test "$subdirfailed" != "yes" && test "$enable_llvm" != "no"])

 AM_CONDITIONAL([ENABLE_YARA],

 	       [test "$enable_yara" != "no"])

+AM_CONDITIONAL([ENABLE_CLAMSUBMIT],

+	       [test "X$have_curl" = "Xyes" && test "X$have_json" = "Xyes"])

 no_recursion="yes";

 AC_OUTPUT([libclamav/Makefile])

@@ -229,7 +231,11 @@ CL_MSG_STATUS([IPv6        ],[$have_cv_ipv6],[$want_ipv6])

 AC_MSG_NOTICE([Summary of optional tools])

 CL_MSG_STATUS([clamdtop    ],[$CURSES_LIBS],[$enable_clamdtop])

 CL_MSG_STATUS([milter      ],[yes],[$have_milter])

-CL_MSG_STATUS([clamsubmit  ],[$have_curl],[$curl_msg])

+if test "X$have_curl" = "Xyes" && test "X$have_json" = "Xyes"; then

+    CL_MSG_STATUS([clamsubmit  ], [yes], [yes])

+else

+    CL_MSG_STATUS([clamsubmit  ], [no], [no])

+fi

 AC_MSG_NOTICE([Summary of engine performance features])

 if test "x$enable_debug" = "xyes"; then