@@ -20,7 +20,7 @@

 ACLOCAL_AMFLAGS=-I m4

-SUBDIRS = libltdl libclamav libfreshclam clamscan clamd clamdscan clamonacc freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests

+SUBDIRS = libltdl libclamav libfreshclam clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter test clamdtop clambc unit_tests

 EXTRA_DIST = examples shared libclamav.pc.in COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.YARA COPYING.pcre platform.h.in libclamunrar libclamunrar_iface libclammspack clamdscan/clamdscan.map win32 ChangeLog.md INSTALL.md NEWS.md README.md

 bin_SCRIPTS=clamav-config

@@ -297,8 +297,8 @@ ETAGS = etags

 CTAGS = ctags

 CSCOPE = cscope

 DIST_SUBDIRS = libltdl libclamav libfreshclam clamscan clamd clamdscan \

-	clamonacc freshclam sigtool clamconf database docs etc \

-	clamav-milter test clamdtop clambc unit_tests clamsubmit fuzz

+	freshclam sigtool clamconf database docs etc clamav-milter \

+	test clamdtop clambc unit_tests clamonacc clamsubmit fuzz

 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/clamav-config.h.in \

 	$(srcdir)/clamav-config.in $(srcdir)/clamav-types.h.in \

 	$(srcdir)/libclamav.pc.in $(srcdir)/platform.h.in \

@@ -619,8 +619,8 @@ top_builddir = @top_builddir@

 top_srcdir = @top_srcdir@

 ACLOCAL_AMFLAGS = -I m4

 SUBDIRS = libltdl libclamav libfreshclam clamscan clamd clamdscan \

-	clamonacc freshclam sigtool clamconf database docs etc \

-	clamav-milter test clamdtop clambc unit_tests $(am__append_1) \

+	freshclam sigtool clamconf database docs etc clamav-milter \

+	test clamdtop clambc unit_tests $(am__append_1) \

 	$(am__append_2) $(am__append_3)

 EXTRA_DIST = examples shared libclamav.pc.in COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL COPYING.llvm COPYING.file COPYING.zlib COPYING.getopt COPYING.regex COPYING.YARA COPYING.pcre platform.h.in libclamunrar libclamunrar_iface libclammspack clamdscan/clamdscan.map win32 ChangeLog.md INSTALL.md NEWS.md README.md

 bin_SCRIPTS = clamav-config

@@ -29188,7 +29188,7 @@ fi

                       if test $curl_version -ge 470272 ; then

                         $enable_clamonacc="yes"

                     else

-                        as_fn_error $? "Your libcurl (e.g. libcurl-devel) is too old. ClamAV (with clamonacc) requires libcurl 7.45 or higher." "$LINENO" 5

+                        as_fn_error $? "Your libcurl (e.g. libcurl-devel) is too old. Installing ClamAV with clamonacc requires libcurl 7.45 or higher. For a quick fix, run ./configure again with --disable-clamonacc if you do not wish to use on-access scanning features. For more information on ClamAV's on-access scanner, please read our documentation: https://www.clamav.net/documents/on-access-scanning#on-access-scanning" "$LINENO" 5

                     fi

 fi

@@ -5765,8 +5765,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 \

@@ -66,7 +66,11 @@ if test "X$have_curl" = "Xyes"; then

                     [if test $curl_version -ge 470272 ; then 

                         $enable_clamonacc="yes"

                     else

-                        AC_MSG_ERROR([Your libcurl (e.g. libcurl-devel) is too old. ClamAV (with clamonacc) requires libcurl 7.45 or higher.])

+                        AC_MSG_ERROR([m4_normalize([

+                                Your libcurl (e.g. libcurl-devel) is too old. Installing ClamAV with clamonacc requires libcurl 7.45 or higher.

+                                For a quick fix, run ./configure again with --disable-clamonacc if you do not wish to use on-access scanning features.

+                                For more information on ClamAV's on-access scanner, please read our documentation: https://www.clamav.net/documents/on-access-scanning#on-access-scanning

+                        ])])

                     fi]

                 )