diff -urNp -x '*.orig' clamav-0.103.0.org/configure.ac clamav-0.103.0/configure.ac
--- clamav-0.103.0.org/configure.ac	2020-09-13 02:27:09.000000000 +0200
+++ clamav-0.103.0/configure.ac	2021-04-06 16:39:49.284297541 +0200
@@ -50,6 +50,7 @@ dnl the date in the version
 AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package])
 
 m4_include([m4/reorganization/version.m4])
+m4_include([m4/reorganization/build_tools.m4])
 
 LT_CONFIG_LTDL_DIR([libltdl])
 LT_INIT([dlopen disable-static])
@@ -58,7 +59,6 @@ PKG_PROG_PKG_CONFIG(0.16)
 
 m4_include([m4/reorganization/libclamav-only.m4])
 
-m4_include([m4/reorganization/build_tools.m4])
 m4_include([m4/reorganization/headers.m4])
 
 AC_CONFIG_FILES([libltdl/Makefile])
@@ -394,7 +394,7 @@ if test "X$have_json" = "Xyes" && test "
     ])
 fi
 
-if test "x$clamonacc-curl" = "xdeprecated"; then
+if test "x$clamonacc_curl" = "xdeprecated"; then
     AC_MSG_WARN([m4_normalize([
 ****** your libcurl (e.g. libcurl-devel) is older than the recommended version. Installing ClamAV with clamonacc requires libcurl 7.40 or higher to use fdpassing.
 ****** fdpassing with clamonacc will be disabled on your system.
diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/build_tools.m4 clamav-0.103.0/m4/reorganization/build_tools.m4
--- clamav-0.103.0.org/m4/reorganization/build_tools.m4	2020-09-13 02:27:10.000000000 +0200
+++ clamav-0.103.0/m4/reorganization/build_tools.m4	2021-04-06 16:39:49.284297541 +0200
@@ -1,3 +1,5 @@
+AM_PROG_AR
+AM_PROG_CC_C_O
 AC_PROG_CC
 AM_PROG_LEX
 AC_PROG_YACC
diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/clamdtop.m4 clamav-0.103.0/m4/reorganization/clamdtop.m4
--- clamav-0.103.0.org/m4/reorganization/clamdtop.m4	2020-09-13 02:27:10.000000000 +0200
+++ clamav-0.103.0/m4/reorganization/clamdtop.m4	2021-04-06 16:39:49.284297541 +0200
@@ -13,8 +13,8 @@ PKG_CHECK_MODULES(NCURSES, [ncurses], [
 
 if test "X$HAVE_LIBNCURSES" != "Xyes"; then
     AC_LIB_FIND([ncurses], [ncurses/ncurses.h],
-	    AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
-			    [initscr(); KEY_RESIZE;]),
+	    [AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
+			    [initscr(); KEY_RESIZE;])],
 	    [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
 	     CURSES_INCLUDE="<ncurses/ncurses.h>"],
 	    [])
@@ -23,8 +23,8 @@ fi
 if test "X$HAVE_LIBNCURSES" != "Xyes"; then
     HAVE_LIBNCURSES=
     AC_LIB_FIND([ncurses], [ncurses.h],
-	    AC_LANG_PROGRAM([#include <ncurses.h>],
-			    [initscr(); KEY_RESIZE;]),
+	    [AC_LANG_PROGRAM([#include <ncurses.h>],
+			    [initscr(); KEY_RESIZE;])],
 	    [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
 	     CURSES_INCLUDE="<ncurses.h>"],
 	    [])
@@ -32,8 +32,8 @@ fi
 
 if test "X$HAVE_LIBNCURSES" != "Xyes"; then
     AC_LIB_FIND([pdcurses],[curses.h],
-			    AC_LANG_PROGRAM([#include <curses.h>],
-					    [initscr(); KEY_RESIZE;]),
+			    [AC_LANG_PROGRAM([#include <curses.h>],
+					    [initscr(); KEY_RESIZE;])],
 			    [CURSES_CPPFLAGS="$INCPDCURSES";
 			     CURSES_LIBS="$LTLIBPDCURSES";
 			     CURSES_INCLUDE="<curses.h>"],
diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/code_checks/unit_tests.m4 clamav-0.103.0/m4/reorganization/code_checks/unit_tests.m4
--- clamav-0.103.0.org/m4/reorganization/code_checks/unit_tests.m4	2020-09-13 02:27:10.000000000 +0200
+++ clamav-0.103.0/m4/reorganization/code_checks/unit_tests.m4	2021-04-06 16:39:49.284297541 +0200
@@ -19,7 +19,7 @@ case "$host_os" in
 esac
 
 	AC_LIB_FIND([check],[check.h],
-			AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)]),
+			[AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)])],
 			[CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK $LDFLAGS"],
 			[])
 
diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/libs/curl.m4 clamav-0.103.0/m4/reorganization/libs/curl.m4
--- clamav-0.103.0.org/m4/reorganization/libs/curl.m4	2020-09-13 02:27:10.000000000 +0200
+++ clamav-0.103.0/m4/reorganization/libs/curl.m4	2021-04-06 16:39:49.284297541 +0200
@@ -64,12 +64,12 @@ if test "X$have_curl" = "Xyes"; then
     dnl end of section
 
     AM_COND_IF([BUILD_CLAMONACC],
-        $enable_clamonacc="yes"
+        enable_clamonacc="yes"
 
-        clamonacc_curl = "current"
+        clamonacc_curl="current"
         dnl if version less than to (7.40 0x072800)
         [if test $curl_version -lt 468992; then
-          clamonacc_curl = "deprecated" 
+          clamonacc_curl="deprecated" 
         fi]
     )