1 diff -ur clamav-0.100.0.orig/configure.ac clamav-0.100.0/configure.ac
2 --- clamav-0.100.0.orig/configure.ac 2018-05-28 14:49:17.067975543 +0000
3 +++ clamav-0.100.0/configure.ac 2018-05-28 14:49:34.516975347 +0000
5 AC_USE_SYSTEM_EXTENSIONS
7 m4_include([m4/reorganization/version.m4])
8 +m4_include([m4/reorganization/build_tools.m4])
10 LT_CONFIG_LTDL_DIR([libltdl])
11 LT_INIT([dlopen disable-static])
12 LTDL_INIT([recursive])
14 -m4_include([m4/reorganization/build_tools.m4])
15 m4_include([m4/reorganization/headers.m4])
17 AC_CONFIG_FILES([libltdl/Makefile])
18 diff -ur clamav-0.100.0.orig/m4/reorganization/build_tools.m4 clamav-0.100.0/m4/reorganization/build_tools.m4
19 --- clamav-0.100.0.orig/m4/reorganization/build_tools.m4 2018-05-28 14:49:17.050975544 +0000
20 +++ clamav-0.100.0/m4/reorganization/build_tools.m4 2018-05-28 14:49:34.516975347 +0000
28 diff -ur clamav-0.100.0.orig/m4/reorganization/clamdtop.m4 clamav-0.100.0/m4/reorganization/clamdtop.m4
29 --- clamav-0.100.0.orig/m4/reorganization/clamdtop.m4 2018-05-28 14:49:17.050975544 +0000
30 +++ clamav-0.100.0/m4/reorganization/clamdtop.m4 2018-05-28 14:49:34.516975347 +0000
32 if test "$enable_clamdtop" != "no"; then
34 AC_LIB_FIND([ncurses], [ncurses/ncurses.h],
35 - AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
36 - [initscr(); KEY_RESIZE;]),
37 + [AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
38 + [initscr(); KEY_RESIZE;])],
39 [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
40 CURSES_INCLUDE="<ncurses/ncurses.h>"],
43 if test "X$HAVE_LIBNCURSES" != "Xyes"; then
45 AC_LIB_FIND([ncurses], [ncurses.h],
46 - AC_LANG_PROGRAM([#include <ncurses.h>],
47 - [initscr(); KEY_RESIZE;]),
48 + [AC_LANG_PROGRAM([#include <ncurses.h>],
49 + [initscr(); KEY_RESIZE;])],
50 [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
51 CURSES_INCLUDE="<ncurses.h>"],
55 if test "X$HAVE_LIBNCURSES" != "Xyes"; then
56 AC_LIB_FIND([pdcurses],[curses.h],
57 - AC_LANG_PROGRAM([#include <curses.h>],
58 - [initscr(); KEY_RESIZE;]),
59 + [AC_LANG_PROGRAM([#include <curses.h>],
60 + [initscr(); KEY_RESIZE;])],
61 [CURSES_CPPFLAGS="$INCPDCURSES";
62 CURSES_LIBS="$LTLIBPDCURSES";
63 CURSES_INCLUDE="<curses.h>"],
64 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
65 --- clamav-0.100.0.orig/m4/reorganization/code_checks/unit_tests.m4 2018-05-28 14:49:17.049975544 +0000
66 +++ clamav-0.100.0/m4/reorganization/code_checks/unit_tests.m4 2018-05-28 14:49:34.517975347 +0000
70 AC_LIB_FIND([check],[check.h],
71 - AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)]),
72 + [AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)])],
73 [CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK $LDFLAGS"],