1 diff -uNr clamav-0.98.3/configure.ac clamav-0.98.3-ac2.68/configure.ac
2 --- clamav-0.98.3/configure.ac 2014-05-06 20:42:41.000000000 +0200
3 +++ clamav-0.98.3-ac2.68/configure.ac 2014-05-09 10:51:30.508280355 +0200
5 AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package])
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 -uNr clamav-0.98.3/m4/reorganization/build_tools.m4 clamav-0.98.3-ac2.68/m4/reorganization/build_tools.m4
19 --- clamav-0.98.3/m4/reorganization/build_tools.m4 2014-05-06 20:39:56.000000000 +0200
20 +++ clamav-0.98.3-ac2.68/m4/reorganization/build_tools.m4 2014-05-09 10:53:30.800262620 +0200
27 diff -uNr clamav-0.98.3/m4/reorganization/clamdtop.m4 clamav-0.98.3-ac2.68/m4/reorganization/clamdtop.m4
28 --- clamav-0.98.3/m4/reorganization/clamdtop.m4 2014-05-06 20:39:56.000000000 +0200
29 +++ clamav-0.98.3-ac2.68/m4/reorganization/clamdtop.m4 2014-05-09 10:51:06.963907781 +0200
31 if test "$enable_clamdtop" != "no"; then
33 AC_LIB_FIND([ncurses], [ncurses/ncurses.h],
34 - AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
35 - [initscr(); KEY_RESIZE;]),
36 + [AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
37 + [initscr(); KEY_RESIZE;])],
38 [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
39 CURSES_INCLUDE="<ncurses/ncurses.h>"],
42 if test "X$HAVE_LIBNCURSES" != "Xyes"; then
44 AC_LIB_FIND([ncurses], [ncurses.h],
45 - AC_LANG_PROGRAM([#include <ncurses.h>],
46 - [initscr(); KEY_RESIZE;]),
47 + [AC_LANG_PROGRAM([#include <ncurses.h>],
48 + [initscr(); KEY_RESIZE;])],
49 [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
50 CURSES_INCLUDE="<ncurses.h>"],
54 if test "X$HAVE_LIBNCURSES" != "Xyes"; then
55 AC_LIB_FIND([pdcurses],[curses.h],
56 - AC_LANG_PROGRAM([#include <curses.h>],
57 - [initscr(); KEY_RESIZE;]),
58 + [AC_LANG_PROGRAM([#include <curses.h>],
59 + [initscr(); KEY_RESIZE;])],
60 [CURSES_CPPFLAGS="$INCPDCURSES";
61 CURSES_LIBS="$LTLIBPDCURSES";
62 CURSES_INCLUDE="<curses.h>"],
63 diff -uNr clamav-0.98.3/m4/reorganization/code_checks/unit_tests.m4 clamav-0.98.3-ac2.68/m4/reorganization/code_checks/unit_tests.m4
64 --- clamav-0.98.3/m4/reorganization/code_checks/unit_tests.m4 2014-05-06 20:39:56.000000000 +0200
65 +++ clamav-0.98.3-ac2.68/m4/reorganization/code_checks/unit_tests.m4 2014-05-09 10:51:06.963907781 +0200
69 AC_LIB_FIND([check],[check.h],
70 - AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)]),
71 + [AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)])],
72 [CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK $LDFLAGS"],