diff -ur clamav-0.100.0.orig/configure.ac clamav-0.100.0/configure.ac
--- clamav-0.100.0.orig/configure.ac	2018-05-28 14:49:17.067975543 +0000
+++ clamav-0.100.0/configure.ac	2018-05-28 14:49:34.516975347 +0000
@@ -43,12 +43,12 @@
 AC_USE_SYSTEM_EXTENSIONS
 
 m4_include([m4/reorganization/version.m4])
+m4_include([m4/reorganization/build_tools.m4])
 
 LT_CONFIG_LTDL_DIR([libltdl])
 LT_INIT([dlopen disable-static])
 LTDL_INIT([recursive])
 
-m4_include([m4/reorganization/build_tools.m4])
 m4_include([m4/reorganization/headers.m4])
 
 AC_CONFIG_FILES([libltdl/Makefile])
diff -ur clamav-0.100.0.orig/m4/reorganization/build_tools.m4 clamav-0.100.0/m4/reorganization/build_tools.m4
--- clamav-0.100.0.orig/m4/reorganization/build_tools.m4	2018-05-28 14:49:17.050975544 +0000
+++ clamav-0.100.0/m4/reorganization/build_tools.m4	2018-05-28 14:49:34.516975347 +0000
@@ -1,4 +1,6 @@
+AM_PROG_AR
 AC_PROG_CC
+AM_PROG_CC_C_O
 AM_PROG_LEX
 AC_PROG_YACC
 AC_PROG_INSTALL
diff -ur clamav-0.100.0.orig/m4/reorganization/clamdtop.m4 clamav-0.100.0/m4/reorganization/clamdtop.m4
--- clamav-0.100.0.orig/m4/reorganization/clamdtop.m4	2018-05-28 14:49:17.050975544 +0000
+++ clamav-0.100.0/m4/reorganization/clamdtop.m4	2018-05-28 14:49:34.516975347 +0000
@@ -5,8 +5,8 @@
 if test "$enable_clamdtop" != "no"; 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>"],
 	    [])
@@ -14,8 +14,8 @@
 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>"],
 	    [])
@@ -23,8 +23,8 @@
 
 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 -ur clamav-0.100.0.orig/m4/reorganization/code_checks/unit_tests.m4 clamav-0.100.0/m4/reorganization/code_checks/unit_tests.m4
--- clamav-0.100.0.orig/m4/reorganization/code_checks/unit_tests.m4	2018-05-28 14:49:17.049975544 +0000
+++ clamav-0.100.0/m4/reorganization/code_checks/unit_tests.m4	2018-05-28 14:49:34.517975347 +0000
@@ -19,7 +19,7 @@
 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"],
 			[])