@@ -119,7 +119,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \

 	$(top_srcdir)/docs/man/clamdtop.1.in \

 	$(top_srcdir)/docs/man/clamsubmit.1.in COPYING config/compile \

 	config/config.guess config/config.rpath config/config.sub \

-	config/depcomp config/install-sh config/missing config/ylwrap \

+	config/install-sh config/missing config/ylwrap \

 	config/ltmain.sh $(top_srcdir)/config/compile \

 	$(top_srcdir)/config/config.guess \

 	$(top_srcdir)/config/config.rpath \

@@ -18201,18 +18201,12 @@ fi

 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

+    for p in /usr/local /usr ; do

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

+            LIBJSON_HOME=$p

             have_json_header="yes"

         fi

-    fi

+    done

 fi

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

@@ -24711,17 +24705,12 @@ fi

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

-    LIBCURL_HOME=/usr/local

-fi

-if test -f "$LIBCURL_HOME/bin/curl-config"; then

-    have_curl="yes"

-else

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

-        LIBCURL_HOME=/usr

-        if test -f "$LIBCURL_HOME/bin/curl-config"; then

-            have_curl="yes"

+    for p in /usr/local /usr ; do

+        if test -f "${p}/bin/curl-config"; then

+           LIBCURL_HOME=$p

+           have_curl="yes"

         fi

-    fi

+    done

 fi

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

@@ -5755,8 +5755,8 @@ maintainer-clean-generic:

 	@echo "This command is intended for maintainers to use"

 	@echo "it deletes files that may require special tools to rebuild."

 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)

-@BUILD_EXTERNAL_LLVM_TRUE@distclean-local:

 @BUILD_EXTERNAL_LLVM_TRUE@clean-local:

+@BUILD_EXTERNAL_LLVM_TRUE@distclean-local:

 clean: clean-am

 clean-am: clean-generic clean-libtool clean-local \