]>
Commit | Line | Data |
---|---|---|
e335899e ŁK |
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 | |
4 | @@ -42,12 +42,12 @@ | |
f63e74d3 | 5 | AC_USE_SYSTEM_EXTENSIONS |
e335899e ŁK |
6 | |
7 | m4_include([m4/reorganization/version.m4]) | |
8 | +m4_include([m4/reorganization/build_tools.m4]) | |
1337bca5 JR |
9 | |
10 | LT_CONFIG_LTDL_DIR([libltdl]) | |
11 | LT_INIT([dlopen disable-static]) | |
e335899e | 12 | LTDL_INIT([recursive]) |
f63e74d3 | 13 | PKG_PROG_PKG_CONFIG(0.16) |
1337bca5 | 14 | |
e335899e ŁK |
15 | -m4_include([m4/reorganization/build_tools.m4]) |
16 | m4_include([m4/reorganization/headers.m4]) | |
17 | ||
18 | AC_CONFIG_FILES([libltdl/Makefile]) | |
19 | diff -uNr clamav-0.98.3/m4/reorganization/build_tools.m4 clamav-0.98.3-ac2.68/m4/reorganization/build_tools.m4 | |
20 | --- clamav-0.98.3/m4/reorganization/build_tools.m4 2014-05-06 20:39:56.000000000 +0200 | |
21 | +++ clamav-0.98.3-ac2.68/m4/reorganization/build_tools.m4 2014-05-09 10:53:30.800262620 +0200 | |
22 | @@ -1,3 +1,5 @@ | |
23 | +AM_PROG_AR | |
24 | +AM_PROG_CC_C_O | |
25 | AC_PROG_CC | |
26 | AC_PROG_INSTALL | |
27 | AC_PROG_LN_S | |
28 | diff -uNr clamav-0.98.3/m4/reorganization/clamdtop.m4 clamav-0.98.3-ac2.68/m4/reorganization/clamdtop.m4 | |
29 | --- clamav-0.98.3/m4/reorganization/clamdtop.m4 2014-05-06 20:39:56.000000000 +0200 | |
30 | +++ clamav-0.98.3-ac2.68/m4/reorganization/clamdtop.m4 2014-05-09 10:51:06.963907781 +0200 | |
31 | @@ -6,8 +6,8 @@ | |
1337bca5 JR |
32 | if test "$enable_clamdtop" != "no"; then |
33 | ||
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>"], | |
41 | []) | |
e335899e | 42 | @@ -15,8 +15,8 @@ |
1337bca5 JR |
43 | if test "X$HAVE_LIBNCURSES" != "Xyes"; then |
44 | HAVE_LIBNCURSES= | |
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>"], | |
52 | []) | |
e335899e | 53 | @@ -24,8 +24,8 @@ |
1337bca5 JR |
54 | |
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>"], | |
e335899e ŁK |
64 | 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 |
65 | --- clamav-0.98.3/m4/reorganization/code_checks/unit_tests.m4 2014-05-06 20:39:56.000000000 +0200 | |
66 | +++ clamav-0.98.3-ac2.68/m4/reorganization/code_checks/unit_tests.m4 2014-05-09 10:51:06.963907781 +0200 | |
67 | @@ -12,7 +12,7 @@ | |
68 | esac | |
5dcc5881 | 69 | |
e335899e ŁK |
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"], | |
74 | []) | |
5dcc5881 | 75 |