projects / packages / clamav.git / blame
| Commit | Line | Data |
|---|---|---|
| 5e04f218 AM |
1 | diff -ur clamav-0.97.5/configure.ac clamav-0.97.5-am/configure.ac |
| 2 | --- clamav-0.97.5/configure.ac 2012-06-28 11:10:46.795377403 +0200 | |
| 3 | +++ clamav-0.97.5-am/configure.ac 2012-06-28 11:01:44.658245193 +0200 | |
| 1337bca5 JR |
4 | @@ -54,6 +54,8 @@ |
| 5 | AC_PROG_INSTALL | |
| 6 | AC_PROG_LN_S | |
| 7 | AC_PROG_MAKE_SET | |
| 8 | +AM_PROG_AR | |
| 9 | +AM_PROG_CC_C_O | |
| 10 | ||
| 11 | LT_CONFIG_LTDL_DIR([libltdl]) | |
| 12 | LT_INIT([dlopen disable-static]) | |
| 13 | @@ -469,7 +471,7 @@ | |
| 14 | ||
| 15 | if test "$enable_check_ut" != "no" ; then | |
| 16 | AC_LIB_FIND([check],[check.h], | |
| 17 | - AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)]), | |
| 18 | + [AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)])], | |
| 19 | [CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK"], | |
| 20 | []) | |
| 21 | fi | |
| 22 | @@ -1549,8 +1551,8 @@ | |
| 23 | if test "$enable_clamdtop" != "no"; then | |
| 24 | ||
| 25 | AC_LIB_FIND([ncurses], [ncurses/ncurses.h], | |
| 26 | - AC_LANG_PROGRAM([#include <ncurses/ncurses.h>], | |
| 27 | - [initscr(); KEY_RESIZE;]), | |
| 28 | + [AC_LANG_PROGRAM([#include <ncurses/ncurses.h>], | |
| 29 | + [initscr(); KEY_RESIZE;])], | |
| 30 | [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES"; | |
| 31 | CURSES_INCLUDE="<ncurses/ncurses.h>"], | |
| 32 | []) | |
| 33 | @@ -1558,8 +1560,8 @@ | |
| 34 | if test "X$HAVE_LIBNCURSES" != "Xyes"; then | |
| 35 | HAVE_LIBNCURSES= | |
| 36 | AC_LIB_FIND([ncurses], [ncurses.h], | |
| 37 | - AC_LANG_PROGRAM([#include <ncurses.h>], | |
| 38 | - [initscr(); KEY_RESIZE;]), | |
| 39 | + [AC_LANG_PROGRAM([#include <ncurses.h>], | |
| 40 | + [initscr(); KEY_RESIZE;])], | |
| 41 | [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES"; | |
| 42 | CURSES_INCLUDE="<ncurses.h>"], | |
| 43 | []) | |
| 44 | @@ -1567,8 +1569,8 @@ | |
| 45 | ||
| 46 | if test "X$HAVE_LIBNCURSES" != "Xyes"; then | |
| 47 | AC_LIB_FIND([pdcurses],[curses.h], | |
| 48 | - AC_LANG_PROGRAM([#include <curses.h>], | |
| 49 | - [initscr(); KEY_RESIZE;]), | |
| 50 | + [AC_LANG_PROGRAM([#include <curses.h>], | |
| 51 | + [initscr(); KEY_RESIZE;])], | |
| 52 | [CURSES_CPPFLAGS="$INCPDCURSES"; | |
| 53 | CURSES_LIBS="$LTLIBPDCURSES"; | |
| 54 | CURSES_INCLUDE="<curses.h>"], | |
| 5dcc5881 AM |
55 | |
| 56 | --- clamav-0.98/configure.ac~ 2013-10-14 20:17:59.000000000 +0200 | |
| 57 | +++ clamav-0.98/configure.ac 2013-10-14 20:19:05.824615211 +0200 | |
| 58 | @@ -34,7 +34,7 @@ | |
| 59 | ||
| 60 | dnl -Wall and -Werror here are NOT CFLAGS, they refer to automake warnings | |
| 61 | dnl enable stealth builds and psychedelic tests | |
| 62 | -AM_INIT_AUTOMAKE([1.10 -Wall -Wportability -Wno-override -Werror std-options foreign dist-bzip2 no-define tar-ustar]) | |
| 63 | +AM_INIT_AUTOMAKE([1.10 -Wall -Wportability -Wno-override std-options foreign dist-bzip2 no-define tar-ustar]) | |
| 64 | ||
| 65 | dnl we told automake to not define these, since we want to include | |
| 66 | dnl the date in the version |