Browse code

Fix clamsubmit prereq checks.

Steven Morgan authored on 2017/08/11 05:21:52
Showing 3 changed files
... ...
@@ -27631,7 +27631,7 @@ else
27631 27631
   ENABLE_YARA_FALSE=
27632 27632
 fi
27633 27633
 
27634
- if test "X$have_curl" != "Xno" && test "X$have_json" != "Xno"; then
27634
+ if test "X$have_curl" = "Xyes" && test "X$have_json" = "Xyes"; then
27635 27635
   ENABLE_CLAMSUBMIT_TRUE=
27636 27636
   ENABLE_CLAMSUBMIT_FALSE='#'
27637 27637
 else
... ...
@@ -202,7 +202,7 @@ AM_CONDITIONAL([ENABLE_LLVM],
202 202
 AM_CONDITIONAL([ENABLE_YARA],
203 203
 	       [test "$enable_yara" != "no"])
204 204
 AM_CONDITIONAL([ENABLE_CLAMSUBMIT],
205
-	       [test "X$have_curl" != "Xno" && test "X$have_json" != "Xno"])
205
+	       [test "X$have_curl" = "Xyes" && test "X$have_json" = "Xyes"])
206 206
 no_recursion="yes";
207 207
 
208 208
 AC_OUTPUT([libclamav/Makefile])
... ...
@@ -5755,8 +5755,8 @@ maintainer-clean-generic:
5755 5755
 	@echo "This command is intended for maintainers to use"
5756 5756
 	@echo "it deletes files that may require special tools to rebuild."
5757 5757
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
5758
-@BUILD_EXTERNAL_LLVM_TRUE@distclean-local:
5759 5758
 @BUILD_EXTERNAL_LLVM_TRUE@clean-local:
5759
+@BUILD_EXTERNAL_LLVM_TRUE@distclean-local:
5760 5760
 clean: clean-am
5761 5761
 
5762 5762
 clean-am: clean-generic clean-libtool clean-local \