--- a/m4/reorganization/os_checks.m4.bak	2019-10-08 21:51:38.649712978 +0000
+++ b/m4/reorganization/os_checks.m4	2019-10-08 21:52:01.893560996 +0000
@@ -5,11 +5,7 @@
     if test "$have_pthreads" = "yes"; then
 	THREAD_LIBS="-lpthread"
 	TH_SAFE="-thread-safe"
-	if test "$want_fanotify" = "yes"; then
-	    AC_CHECK_HEADER([sys/fanotify.h],
-               [AC_DEFINE([FANOTIFY],1,[use fanotify])
-                have_fanotify="yes"],)
-	fi
+        have_fanotify="yes"
     fi
     ;;
 kfreebsd*-gnu)

--- a/configure    2019-10-08 22:22:47.687578951 +0000
+++ b/configure    2019-10-08 22:23:59.967602999 +0000
@@ -29828,7 +29828,7 @@

     if test -z "$BUILD_CLAMONACC_TRUE"; then :
                       if test $curl_version -ge 470272 ; then
-                        $enable_clamonacc="yes"
+                        enable_clamonacc="yes"
                     else
                         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