]>
Commit | Line | Data |
---|---|---|
1337bca5 JR |
1 | diff -ur clamav-0.97.5/clamav-milter/Makefile.am clamav-0.97.5-am/clamav-milter/Makefile.am |
2 | --- clamav-0.97.5/clamav-milter/Makefile.am 2012-06-12 15:36:05.000000000 +0200 | |
3 | +++ clamav-0.97.5-am/clamav-milter/Makefile.am 2012-06-28 11:10:21.205378306 +0200 | |
4 | @@ -45,7 +45,7 @@ | |
5 | endif | |
6 | ||
7 | DEFS = @DEFS@ -DCL_NOLIBCLAMAV | |
8 | -CFLAGS=`echo "@CFLAGS@" | sed -e 's/-Wwrite-strings//' -e 's/-Werror /-Werror -Wno-error=format-nonliteral /'` | |
9 | +AM_CFLAGS=`echo "@CFLAGS@" | sed -e 's/-Wwrite-strings//' -e 's/-Werror /-Werror -Wno-error=format-nonliteral /'` | |
10 | LIBS = $(top_builddir)/libclamav/libclamav_internal_utils.la @CLAMAV_MILTER_LIBS@ @THREAD_LIBS@ | |
11 | AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir) | |
12 | CLEANFILES=*.gcda *.gcno | |
13 | diff -ur clamav-0.97.5/configure.in clamav-0.97.5-am/configure.in | |
14 | --- clamav-0.97.5/configure.in 2012-06-28 11:10:46.795377403 +0200 | |
15 | +++ clamav-0.97.5-am/configure.in 2012-06-28 11:01:44.658245193 +0200 | |
16 | @@ -54,6 +54,8 @@ | |
17 | AC_PROG_INSTALL | |
18 | AC_PROG_LN_S | |
19 | AC_PROG_MAKE_SET | |
20 | +AM_PROG_AR | |
21 | +AM_PROG_CC_C_O | |
22 | ||
23 | LT_CONFIG_LTDL_DIR([libltdl]) | |
24 | LT_INIT([dlopen disable-static]) | |
25 | @@ -469,7 +471,7 @@ | |
26 | ||
27 | if test "$enable_check_ut" != "no" ; then | |
28 | AC_LIB_FIND([check],[check.h], | |
29 | - AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)]), | |
30 | + [AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)])], | |
31 | [CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK"], | |
32 | []) | |
33 | fi | |
34 | @@ -1549,8 +1551,8 @@ | |
35 | if test "$enable_clamdtop" != "no"; then | |
36 | ||
37 | AC_LIB_FIND([ncurses], [ncurses/ncurses.h], | |
38 | - AC_LANG_PROGRAM([#include <ncurses/ncurses.h>], | |
39 | - [initscr(); KEY_RESIZE;]), | |
40 | + [AC_LANG_PROGRAM([#include <ncurses/ncurses.h>], | |
41 | + [initscr(); KEY_RESIZE;])], | |
42 | [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES"; | |
43 | CURSES_INCLUDE="<ncurses/ncurses.h>"], | |
44 | []) | |
45 | @@ -1558,8 +1560,8 @@ | |
46 | if test "X$HAVE_LIBNCURSES" != "Xyes"; then | |
47 | HAVE_LIBNCURSES= | |
48 | AC_LIB_FIND([ncurses], [ncurses.h], | |
49 | - AC_LANG_PROGRAM([#include <ncurses.h>], | |
50 | - [initscr(); KEY_RESIZE;]), | |
51 | + [AC_LANG_PROGRAM([#include <ncurses.h>], | |
52 | + [initscr(); KEY_RESIZE;])], | |
53 | [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES"; | |
54 | CURSES_INCLUDE="<ncurses.h>"], | |
55 | []) | |
56 | @@ -1567,8 +1569,8 @@ | |
57 | ||
58 | if test "X$HAVE_LIBNCURSES" != "Xyes"; then | |
59 | AC_LIB_FIND([pdcurses],[curses.h], | |
60 | - AC_LANG_PROGRAM([#include <curses.h>], | |
61 | - [initscr(); KEY_RESIZE;]), | |
62 | + [AC_LANG_PROGRAM([#include <curses.h>], | |
63 | + [initscr(); KEY_RESIZE;])], | |
64 | [CURSES_CPPFLAGS="$INCPDCURSES"; | |
65 | CURSES_LIBS="$LTLIBPDCURSES"; | |
66 | CURSES_INCLUDE="<curses.h>"], | |
67 | diff -ur clamav-0.97.5/m4/resolv.m4 clamav-0.97.5-am/m4/resolv.m4 | |
68 | --- clamav-0.97.5/m4/resolv.m4 2012-06-12 15:36:05.000000000 +0200 | |
69 | +++ clamav-0.97.5-am/m4/resolv.m4 2012-06-28 11:09:01.312047789 +0200 | |
70 | @@ -18,7 +18,7 @@ | |
71 | [ | |
72 | AC_CACHE_CHECK([for dn_expand in std libs], [ac_cv_have_lresolv_std], [ | |
73 | ac_cv_have_lresolv_std='no' | |
74 | - AC_LINK_IFELSE([ | |
75 | + AC_LINK_IFELSE([AC_LANG_SOURCE([ | |
76 | #include <sys/types.h> | |
77 | #include <netinet/in.h> | |
78 | #include <arpa/nameser.h> | |
79 | @@ -28,14 +28,14 @@ | |
80 | [ | |
81 | ac_cv_have_lresolv_std='yes' | |
82 | ac_cv_have_lresolv='' | |
83 | - ]) | |
84 | + ])]) | |
85 | ]) | |
86 | if test "x$ac_cv_have_lresolv" = "xno"; then | |
87 | bklibs=$LIBS | |
88 | LIBS=-lresolv | |
89 | AC_CACHE_CHECK([for dn_expand in -lresolv], [ac_cv_have_lresolv_lresolv], [ | |
90 | ac_cv_have_lresolv_lresolv='yes' | |
91 | - AC_LINK_IFELSE([ | |
92 | + AC_LINK_IFELSE([AC_LANG_SOURCE([ | |
93 | #include <sys/types.h> | |
94 | #include <netinet/in.h> | |
95 | #include <arpa/nameser.h> | |
96 | @@ -45,7 +45,7 @@ | |
97 | [ | |
98 | ac_cv_have_lresolv_lresolv='yes' | |
99 | ac_cv_have_lresolv=' -lresolv' | |
100 | - ]) | |
101 | + ])]) | |
102 | ]) | |
103 | LIBS=$bklibs; | |
104 | fi |