@@ -17923,79 +17923,74 @@ CFLAGS="$save_CFLAGS"

 LIBS="$save_LIBS"

+have_json_header="no"

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjson installation" >&5

+$as_echo_n "checking for libjson installation... " >&6; }

+

 # Check whether --with-libjson was given.

 if test "${with_libjson+set}" = set; then :

   withval=$with_libjson;

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjson installation" >&5

-$as_echo_n "checking for libjson installation... " >&6; }

-if test "X$withval" != "Xyes"

-then

-  LIBJSON_HOME="$withval"

-  if test -f "$LIBJSON_HOME/include/json/json.h" -o -f "$LIBJSON_HOME/include/json-c/json.h"

-  then

-    have_json_header="yes"

-  fi

+find_json="no"

+if test "X$withval" = "Xyes"; then

+    find_json="yes"

 else

-  LIBJSON_HOME=/usr/local

-  if test -f "$LIBJSON_HOME/include/json/json.h" -o -f "$LIBJSON_HOME/include/json-c/json.h"

-  then

-    have_json_header="yes"

-  else

-    LIBJSON_HOME=/usr

-    if test -f "$LIBJSON_HOME/include/json/json.h" -o -f "$LIBJSON_HOME/include/json-c/json.h"

-    then

-      have_json_header="yes"

-    else

-      have_json_header="no"

-      LIBJSON_HOME=""

+    if test "X$withval" != "Xno"; then

+        LIBJSON_HOME="$withval"

     fi

-  fi

-fi

-if test "X$have_json_header" != "Xyes"

-then

-    as_fn_error $? "unable to find json includes." "$LINENO" 5

 fi

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBJSON_HOME" >&5

-$as_echo "$LIBJSON_HOME" >&6; }

 else

+  find_json="yes"

+fi

-have_json_header="no"

+if test "X$find_json" = "Xyes"; then

+    LIBJSON_HOME=/usr/local

 fi

+if test -f "$LIBJSON_HOME/include/json/json.h" -o -f "$LIBJSON_HOME/include/json-c/json.h"; then

+    have_json_header="yes"

+else

+    if test "X$find_json" = "Xyes"; then

+        LIBJSON_HOME=/usr

+        if test -f "$LIBJSON_HOME/include/json/json.h" -o -f "$LIBJSON_HOME/include/json-c/json.h"; then

+            have_json_header="yes"

+        fi

+    fi

+fi

-if test "X$have_json_header" = "Xyes"

-then

-  if test -f "$LIBJSON_HOME/include/json/json.h"

-  then

-    JSON_INCLUDE="include/json"

-  fi

-  if test -f "$LIBJSON_HOME/include/json-c/json.h"

-  then

-    JSON_INCLUDE="include/json-c"

-  fi

-  if test -z $JSON_INCLUDE

-  then

-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: json header lost." >&5

+if test "X$have_json_header" = "Xyes"; then

+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBJSON_HOME" >&5

+$as_echo "$LIBJSON_HOME" >&6; }

+    if test -f "$LIBJSON_HOME/include/json/json.h"

+    then

+        JSON_INCLUDE="include/json"

+    fi

+    if test -f "$LIBJSON_HOME/include/json-c/json.h"

+    then

+        JSON_INCLUDE="include/json-c"

+    fi

+    if test -z $JSON_INCLUDE

+    then

+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: json header lost." >&5

 $as_echo "$as_me: WARNING: json header lost." >&2;}

-  fi

+    fi

-  JSON_CPPFLAGS="-I$LIBJSON_HOME/$JSON_INCLUDE"

-  save_LDFLAGS="$LDFLAGS"

-  save_CFLAGS="$CFLAGS"

-  save_LIBS="$LIBS"

-  LIBS=""

-  JSON_LIBS=""

-  if test "$LIBJSON_HOME" != "/usr"

-  then

-    JSON_LDFLAGS="-L$LIBJSON_HOME/lib"

-    LDFLAGS="$LDFLAGS $JSON_LDFLAGS"

-    CFLAGS="$CFLAGS $JSON_CPPFLAGS"

-  fi

+    JSON_CPPFLAGS="-I$LIBJSON_HOME/$JSON_INCLUDE"

+    save_LDFLAGS="$LDFLAGS"

+    save_CFLAGS="$CFLAGS"

+    save_LIBS="$LIBS"

+    LIBS=""

+    JSON_LIBS=""

+    if test "$LIBJSON_HOME" != "/usr"

+    then

+        JSON_LDFLAGS="-L$LIBJSON_HOME/lib"

+        LDFLAGS="$LDFLAGS $JSON_LDFLAGS"

+        CFLAGS="$CFLAGS $JSON_CPPFLAGS"

+    fi

-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing json_object_object_get_ex" >&5

+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing json_object_object_get_ex" >&5

 $as_echo_n "checking for library containing json_object_object_get_ex... " >&6; }

 if ${ac_cv_search_json_object_object_get_ex+:} false; then :

   $as_echo_n "(cached) " >&6

@@ -18049,12 +18044,12 @@ ac_res=$ac_cv_search_json_object_object_get_ex

 if test "$ac_res" != no; then :

   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

-have_json="yes"

-have_deprecated_json="no"

+        have_json="yes"

+        have_deprecated_json="no"

 else

-have_json="no"

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing json_object_object_get" >&5

+        have_json="no"

+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing json_object_object_get" >&5

 $as_echo_n "checking for library containing json_object_object_get... " >&6; }

 if ${ac_cv_search_json_object_object_get+:} false; then :

   $as_echo_n "(cached) " >&6

@@ -18108,8 +18103,8 @@ ac_res=$ac_cv_search_json_object_object_get

 if test "$ac_res" != no; then :

   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"

-have_json="yes"

-have_deprecated_json="yes"

+            have_json="yes"

+            have_deprecated_json="yes"

 fi

@@ -18117,27 +18112,26 @@ fi

 fi

-  CFLAGS="$save_CFLAGS"

-  LDFLAGS="$save_LDFLAGS"

+    CFLAGS="$save_CFLAGS"

+    LDFLAGS="$save_LDFLAGS"

 fi

 if test "X$have_json" = "Xyes"; then

 $as_echo "#define HAVE_JSON 1" >>confdefs.h

-  if test "X$have_deprecated_json" = "Xyes"; then

+    if test "X$have_deprecated_json" = "Xyes"; then

 $as_echo "#define HAVE_DEPRECATED_JSON 1" >>confdefs.h

-  fi

-  JSON_LIBS="$LIBS"

+    fi

+    JSON_LIBS="$LIBS"

 fi

 LIBS="$save_LIBS"

-

 # Check whether --with-pcre was given.

 if test "${with_pcre+set}" = set; then :

   withval=$with_pcre; pcreser=$withval

@@ -24120,7 +24114,6 @@ else

 fi

-

 # PRELUDE

 # Check whether --enable-prelude was given.

 if test "${enable_prelude+set}" = set; then :

@@ -24381,7 +24374,6 @@ $as_echo "#define PRELUDE 1" >>confdefs.h

 fi

-

 case "$host_os" in

 freebsd*)

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kinfo_getvmmap in -lutil" >&5

@@ -24430,8 +24422,8 @@ fi

 esac

+

 have_curl="no"

-curl_msg="Please use the web interface for submitting FPs/FNs."

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl installation" >&5

 $as_echo_n "checking for libcurl installation... " >&6; }

@@ -24574,8 +24566,6 @@ fi

-

-

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

 if test "${with_system_libmspack+set}" = set; then :

   withval=$with_system_libmspack; system_libmspack=$withval

@@ -24679,7 +24669,6 @@ fi

 fi

-

 # Check whether --enable-strni was given.

 if test "${enable_strni+set}" = set; then :

   enableval=$enable_strni; enable_strni=$enableval

@@ -30184,29 +30173,61 @@ if test "X$have_curl" = "Xyes" && test "X$have_json" = "Xyes"; then

    $as_echo_n "              clamsubmit  : "

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

-  $as_echo "yes (disabled)"

+  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME), libcurl-devel found at $LIBCURL_HOME) (disabled)"

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

-  $as_echo "yes"

+  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME), libcurl-devel found at $LIBCURL_HOME)"

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

-  $as_echo "yes"

+  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME), libcurl-devel found at $LIBCURL_HOME)"

 else

-  $as_echo "yes (yes)"

+  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME), libcurl-devel found at $LIBCURL_HOME) (yes)"

 fi

 else

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

    $as_echo_n "              clamsubmit  : "

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

-  $as_echo "no (disabled)"

+  $as_echo "no (missing libjson-c-dev AND libcurl-devel. Use the website to submit FPs/FNs.) (disabled)"

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

-  $as_echo "no"

+  $as_echo "no (missing libjson-c-dev AND libcurl-devel. Use the website to submit FPs/FNs.)"

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

-  $as_echo "no"

+  $as_echo "no (missing libjson-c-dev AND libcurl-devel. Use the website to submit FPs/FNs.)"

 else

-  $as_echo "no (no)"

+  $as_echo "no (missing libjson-c-dev AND libcurl-devel. Use the website to submit FPs/FNs.) (no)"

 fi

+    else

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

+

+

+   $as_echo_n "              clamsubmit  : "

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

+  $as_echo "no (missing libjson-c-dev. Use the website to submit FPs/FNs.) (disabled)"

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

+  $as_echo "no (missing libjson-c-dev. Use the website to submit FPs/FNs.)"

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

+  $as_echo "no (missing libjson-c-dev. Use the website to submit FPs/FNs.)"

+else

+  $as_echo "no (missing libjson-c-dev. Use the website to submit FPs/FNs.) (no)"

+fi

+

+        else

+

+

+   $as_echo_n "              clamsubmit  : "

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

+  $as_echo "no (missing libcurl-devel. Use the website to submit FPs/FNs.) (disabled)"

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

+  $as_echo "no (missing libcurl-devel. Use the website to submit FPs/FNs.)"

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

+  $as_echo "no (missing libcurl-devel. Use the website to submit FPs/FNs.)"

+else

+  $as_echo "no (missing libcurl-devel. Use the website to submit FPs/FNs.) (no)"

+fi

+

+        fi

+    fi

 fi

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

@@ -30263,13 +30284,13 @@ elif test "x$llvm_linking" = "x"; then

    $as_echo_n "              llvm        : "

    if test "x$enable_llvm" = "xno"; then :

-  $as_echo "$have_jit($llvmver), from $system_llvm (disabled)"

+  $as_echo "$have_jit ($llvmver), from $system_llvm (disabled)"

 elif test "x$enable_llvm" = "xyes"; then :

-  $as_echo "$have_jit($llvmver), from $system_llvm"

+  $as_echo "$have_jit ($llvmver), from $system_llvm"

 elif test "x$enable_llvm" = "x"; then :

-  $as_echo "$have_jit($llvmver), from $system_llvm"

+  $as_echo "$have_jit ($llvmver), from $system_llvm"

 else

-  $as_echo "$have_jit($llvmver), from $system_llvm ($enable_llvm)"

+  $as_echo "$have_jit ($llvmver), from $system_llvm ($enable_llvm)"

 fi

 else

@@ -30277,13 +30298,13 @@ else

    $as_echo_n "              llvm        : "

    if test "x$enable_llvm" = "xno"; then :

-  $as_echo "$have_jit($llvmver), from $system_llvm ($llvm_linking) (disabled)"

+  $as_echo "$have_jit ($llvmver), from $system_llvm ($llvm_linking) (disabled)"

 elif test "x$enable_llvm" = "xyes"; then :

-  $as_echo "$have_jit($llvmver), from $system_llvm ($llvm_linking)"

+  $as_echo "$have_jit ($llvmver), from $system_llvm ($llvm_linking)"

 elif test "x$enable_llvm" = "x"; then :

-  $as_echo "$have_jit($llvmver), from $system_llvm ($llvm_linking)"

+  $as_echo "$have_jit ($llvmver), from $system_llvm ($llvm_linking)"

 else

-  $as_echo "$have_jit($llvmver), from $system_llvm ($llvm_linking) ($enable_llvm)"

+  $as_echo "$have_jit ($llvmver), from $system_llvm ($llvm_linking) ($enable_llvm)"

 fi

 fi

@@ -30342,31 +30363,32 @@ else

   $as_echo "$want_unrar ($want_unrar)"

 fi

-if test "x$LIBJSON_HOME" != "x"; then

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

-   $as_echo_n "              libjson     : "

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

-  $as_echo "$LIBJSON_HOME (disabled)"

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

-  $as_echo "$LIBJSON_HOME"

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

-  $as_echo "$LIBJSON_HOME"

+   $as_echo_n "              preclass    : "

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

+  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME) (disabled)"

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

+  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME)"

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

+  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME)"

 else

-  $as_echo "$LIBJSON_HOME ($have_json)"

+  $as_echo "yes (libjson-c-dev found at $LIBJSON_HOME) (yes)"

 fi

+else

    $as_echo_n "              preclass    : "

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

-  $as_echo "$LIBJSON_HOME (disabled)"

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

-  $as_echo "$LIBJSON_HOME"

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

-  $as_echo "$LIBJSON_HOME"

-else

-  $as_echo "$LIBJSON_HOME ($have_json)"

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

+  $as_echo "no (missing libjson-c-dev) (disabled)"

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

+  $as_echo "no (missing libjson-c-dev)"

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

+  $as_echo "no (missing libjson-c-dev)"

+else

+  $as_echo "no (missing libjson-c-dev) (no)"

 fi

 fi