ac2.68.patch

   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 @@
   5  AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package])
   6
   7  m4_include([m4/reorganization/version.m4])
   8 +m4_include([m4/reorganization/build_tools.m4])
   9
  10  LT_CONFIG_LTDL_DIR([libltdl])
  11  LT_INIT([dlopen disable-static])
  12  LTDL_INIT([recursive])
  13
  14 -m4_include([m4/reorganization/build_tools.m4])
  15  m4_include([m4/reorganization/headers.m4])
  16
  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
  21 @@ -1,3 +1,5 @@
  22 +AM_PROG_AR
  23  AC_PROG_CC
  24 +AM_PROG_CC_C_O
  25  AC_PROG_INSTALL
  26  AC_PROG_LN_S
  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
  30 @@ -6,8 +6,8 @@
  31  if test "$enable_clamdtop" != "no"; then
  32
  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>"],
  40             [])
  41 @@ -15,8 +15,8 @@
  42  if test "X$HAVE_LIBNCURSES" != "Xyes"; then
  43      HAVE_LIBNCURSES=
  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>"],
  51             [])
  52 @@ -24,8 +24,8 @@
  53
  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
  66 @@ -12,7 +12,7 @@
  67  esac
  68
  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"],
  73                         [])
  74