@@ -127,18 +127,13 @@ m4_include([m4/reorganization/sha_collect.m4])

 m4_include([m4/reorganization/yara.m4])

 m4_include([m4/reorganization/code_checks/fts.m4])

 m4_include([m4/reorganization/libfreshclam.m4])

-

 m4_include([m4/reorganization/prelude.m4])

-

 m4_include([m4/reorganization/bsd.m4])

 dnl Freshclam dependencies

 m4_include([m4/reorganization/libs/curl.m4])

-

 m4_include([m4/reorganization/substitutions.m4])

-

 m4_include([m4/reorganization/libmspack.m4])

-

 m4_include([m4/reorganization/strni.m4])

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

@@ -236,9 +231,17 @@ AC_MSG_NOTICE([Summary of optional tools])

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

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

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

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

+    CL_MSG_STATUS([clamsubmit  ], [yes (libjson-c-dev found at $LIBJSON_HOME), libcurl-devel found at $LIBCURL_HOME)], [yes])

 else

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

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

+        CL_MSG_STATUS([clamsubmit  ], [no (missing libjson-c-dev AND libcurl-devel. Use the website to submit FPs/FNs.)], [no])

+    else

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

+            CL_MSG_STATUS([clamsubmit  ], [no (missing libjson-c-dev. Use the website to submit FPs/FNs.)], [no])

+        else

+            CL_MSG_STATUS([clamsubmit  ], [no (missing libcurl-devel. Use the website to submit FPs/FNs.)], [no])

+        fi

+    fi

 fi

 AC_MSG_NOTICE([Summary of engine performance features])

@@ -254,9 +257,9 @@ fi

 if test "$enable_llvm" = "no"; then

    CL_MSG_STATUS([llvm        ],[$have_jit],[$enable_llvm])

 elif test "x$llvm_linking" = "x"; then

-   CL_MSG_STATUS([llvm        ],[$have_jit($llvmver), from $system_llvm],[$enable_llvm])

+   CL_MSG_STATUS([llvm        ],[$have_jit ($llvmver), from $system_llvm],[$enable_llvm])

 else

-   CL_MSG_STATUS([llvm        ],[$have_jit($llvmver), from $system_llvm ($llvm_linking)],[$enable_llvm])

+   CL_MSG_STATUS([llvm        ],[$have_jit ($llvmver), from $system_llvm ($llvm_linking)],[$enable_llvm])

 fi

 CL_MSG_STATUS([mempool     ],[$have_mempool],[$enable_mempool])

@@ -264,9 +267,10 @@ AC_MSG_NOTICE([Summary of engine detection features])

 CL_MSG_STATUS([bzip2       ],[$bzip_check],[$want_bzip2])

 CL_MSG_STATUS([zlib        ],[$ZLIB_HOME],[yes])

 CL_MSG_STATUS([unrar       ],[$want_unrar],[$want_unrar])

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

-    CL_MSG_STATUS([libjson     ],[$LIBJSON_HOME],[$have_json])

-    CL_MSG_STATUS([preclass    ],[$LIBJSON_HOME],[$have_json])

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

+    CL_MSG_STATUS([preclass    ],[yes (libjson-c-dev found at $LIBJSON_HOME)],[yes])

+else

+    CL_MSG_STATUS([preclass    ],[no (missing libjson-c-dev)],[no])

 fi

 if test "x$PCRE_HOME" = "x"; then

     CL_MSG_STATUS([pcre        ],[no],[$have_pcre])

@@ -1,5 +1,6 @@

+dnl Check for libcurl

+

 have_curl="no"

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

 AC_MSG_CHECKING([for libcurl installation])

 AC_ARG_WITH([libcurl],

@@ -1,92 +1,86 @@

 dnl Check for libjson

+have_json_header="no"

+AC_MSG_CHECKING([for libjson installation])

+

 AC_ARG_WITH([libjson],

 [AS_HELP_STRING([--with-libjson@<:@=DIR@:>@], [path to directory containing libjson

                 @<:@default=/usr/local or /usr if not found in /usr/local@:>@])],

 [

-AC_MSG_CHECKING([for libjson installation])

-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

-    AC_MSG_ERROR([unable to find json includes.])

-fi

-AC_MSG_RESULT([$LIBJSON_HOME])

 ],

-[

-have_json_header="no"

-])

+[find_json="yes"])

-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

-    AC_MSG_WARN([json header lost.])

-  fi

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

+    LIBJSON_HOME=/usr/local

+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

+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

-  AC_SEARCH_LIBS([json_object_object_get_ex], [json-c json], [

-have_json="yes"

-have_deprecated_json="no"], [

-have_json="no"

-AC_SEARCH_LIBS([json_object_object_get], [json-c json], [

-have_json="yes"

-have_deprecated_json="yes"

-])

-])

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

+    AC_MSG_RESULT([$LIBJSON_HOME])

+    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

+        AC_MSG_WARN([json header lost.])

+    fi

-  CFLAGS="$save_CFLAGS"

-  LDFLAGS="$save_LDFLAGS"

+    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

+

+    AC_SEARCH_LIBS([json_object_object_get_ex], [json-c json], [

+        have_json="yes"

+        have_deprecated_json="no"], [

+        have_json="no"

+        AC_SEARCH_LIBS([json_object_object_get], [json-c json], [

+            have_json="yes"

+            have_deprecated_json="yes"

+        ])

+    ])

+

+    CFLAGS="$save_CFLAGS"

+    LDFLAGS="$save_LDFLAGS"

 fi

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

-  AC_DEFINE([HAVE_JSON],1,[Define to 1 if you have the 'libjson' library (-ljson).])

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

-    AC_DEFINE([HAVE_DEPRECATED_JSON],1,[Define to 1 if you have a deprecated version of the 'libjson' library (-ljson).])

-  fi

-  JSON_LIBS="$LIBS"

+    AC_DEFINE([HAVE_JSON],1,[Define to 1 if you have the 'libjson' library (-ljson).])

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

+        AC_DEFINE([HAVE_DEPRECATED_JSON],1,[Define to 1 if you have a deprecated version of the 'libjson' library (-ljson).])

+    fi

+    JSON_LIBS="$LIBS"

 fi

 LIBS="$save_LIBS"

-