]>
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 | |
e63bc447 | 4 | @@ -53,6 +53,7 @@ |
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]) | |
e63bc447 AG |
12 | @@ -61,7 +62,6 @@ |
13 | ||
14 | m4_include([m4/reorganization/libclamav-only.m4]) | |
1337bca5 | 15 | |
e335899e ŁK |
16 | -m4_include([m4/reorganization/build_tools.m4]) |
17 | m4_include([m4/reorganization/headers.m4]) | |
18 | ||
19 | AC_CONFIG_FILES([libltdl/Makefile]) | |
8cdcf5e0 JB |
20 | @@ -396,7 +396,7 @@ |
21 | ]) | |
22 | fi | |
23 | ||
24 | -if test "x$clamonacc-curl" = "xdeprecated"; then | |
25 | +if test "x$clamonacc_curl" = "xdeprecated"; then | |
26 | AC_MSG_WARN([m4_normalize([ | |
27 | ****** 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. | |
28 | ****** fdpassing with clamonacc will be disabled on your system. | |
e335899e ŁK |
29 | diff -uNr clamav-0.98.3/m4/reorganization/build_tools.m4 clamav-0.98.3-ac2.68/m4/reorganization/build_tools.m4 |
30 | --- clamav-0.98.3/m4/reorganization/build_tools.m4 2014-05-06 20:39:56.000000000 +0200 | |
31 | +++ clamav-0.98.3-ac2.68/m4/reorganization/build_tools.m4 2014-05-09 10:53:30.800262620 +0200 | |
32 | @@ -1,3 +1,5 @@ | |
33 | +AM_PROG_AR | |
34 | +AM_PROG_CC_C_O | |
35 | AC_PROG_CC | |
36 | AC_PROG_INSTALL | |
37 | AC_PROG_LN_S | |
8cdcf5e0 JB |
38 | --- clamav-0.103.0/m4/reorganization/clamdtop.m4.orig 2020-09-13 02:27:10.000000000 +0200 |
39 | +++ clamav-0.103.0/m4/reorganization/clamdtop.m4 2020-11-23 06:28:37.380116770 +0100 | |
40 | @@ -13,8 +13,8 @@ | |
1337bca5 | 41 | |
8cdcf5e0 JB |
42 | if test "X$HAVE_LIBNCURSES" != "Xyes"; then |
43 | AC_LIB_FIND([ncurses], [ncurses/ncurses.h], | |
1337bca5 JR |
44 | - AC_LANG_PROGRAM([#include <ncurses/ncurses.h>], |
45 | - [initscr(); KEY_RESIZE;]), | |
46 | + [AC_LANG_PROGRAM([#include <ncurses/ncurses.h>], | |
47 | + [initscr(); KEY_RESIZE;])], | |
48 | [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES"; | |
49 | CURSES_INCLUDE="<ncurses/ncurses.h>"], | |
50 | []) | |
8cdcf5e0 | 51 | @@ -23,8 +23,8 @@ |
1337bca5 JR |
52 | if test "X$HAVE_LIBNCURSES" != "Xyes"; then |
53 | HAVE_LIBNCURSES= | |
54 | AC_LIB_FIND([ncurses], [ncurses.h], | |
55 | - AC_LANG_PROGRAM([#include <ncurses.h>], | |
56 | - [initscr(); KEY_RESIZE;]), | |
57 | + [AC_LANG_PROGRAM([#include <ncurses.h>], | |
58 | + [initscr(); KEY_RESIZE;])], | |
59 | [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES"; | |
60 | CURSES_INCLUDE="<ncurses.h>"], | |
61 | []) | |
8cdcf5e0 | 62 | @@ -32,8 +32,8 @@ |
1337bca5 JR |
63 | |
64 | if test "X$HAVE_LIBNCURSES" != "Xyes"; then | |
65 | AC_LIB_FIND([pdcurses],[curses.h], | |
66 | - AC_LANG_PROGRAM([#include <curses.h>], | |
67 | - [initscr(); KEY_RESIZE;]), | |
68 | + [AC_LANG_PROGRAM([#include <curses.h>], | |
69 | + [initscr(); KEY_RESIZE;])], | |
70 | [CURSES_CPPFLAGS="$INCPDCURSES"; | |
71 | CURSES_LIBS="$LTLIBPDCURSES"; | |
72 | CURSES_INCLUDE="<curses.h>"], | |
e335899e ŁK |
73 | 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 |
74 | --- clamav-0.98.3/m4/reorganization/code_checks/unit_tests.m4 2014-05-06 20:39:56.000000000 +0200 | |
75 | +++ clamav-0.98.3-ac2.68/m4/reorganization/code_checks/unit_tests.m4 2014-05-09 10:51:06.963907781 +0200 | |
76 | @@ -12,7 +12,7 @@ | |
77 | esac | |
5dcc5881 | 78 | |
e335899e ŁK |
79 | AC_LIB_FIND([check],[check.h], |
80 | - AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)]), | |
81 | + [AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)])], | |
82 | [CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK $LDFLAGS"], | |
83 | []) | |
5dcc5881 | 84 | |
8cdcf5e0 JB |
85 | --- clamav-0.103.0/m4/reorganization/libs/curl.m4.orig 2020-09-13 02:27:10.000000000 +0200 |
86 | +++ clamav-0.103.0/m4/reorganization/libs/curl.m4 2020-11-23 20:23:04.812211547 +0100 | |
87 | @@ -64,12 +64,12 @@ | |
88 | dnl end of section | |
89 | ||
90 | AM_COND_IF([BUILD_CLAMONACC], | |
91 | - $enable_clamonacc="yes" | |
92 | + enable_clamonacc="yes" | |
93 | ||
94 | - clamonacc_curl = "current" | |
95 | + clamonacc_curl="current" | |
96 | dnl if version less than to (7.40 0x072800) | |
97 | [if test $curl_version -lt 468992; then | |
98 | - clamonacc_curl = "deprecated" | |
99 | + clamonacc_curl="deprecated" | |
100 | fi] | |
101 | ) | |
102 |