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 @@ -53,6 +53,7 @@
   5  AC_USE_SYSTEM_EXTENSIONS
   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 @@ -61,7 +62,6 @@
  13
  14  m4_include([m4/reorganization/libclamav-only.m4])
  15
  16 -m4_include([m4/reorganization/build_tools.m4])
  17  m4_include([m4/reorganization/headers.m4])
  18
  19  AC_CONFIG_FILES([libltdl/Makefile])
  20 diff -uNr clamav-0.98.3/m4/reorganization/build_tools.m4 clamav-0.98.3-ac2.68/m4/reorganization/build_tools.m4
  21 --- clamav-0.98.3/m4/reorganization/build_tools.m4      2014-05-06 20:39:56.000000000 +0200
  22 +++ clamav-0.98.3-ac2.68/m4/reorganization/build_tools.m4       2014-05-09 10:53:30.800262620 +0200
  23 @@ -1,3 +1,5 @@
  24 +AM_PROG_AR
  25 +AM_PROG_CC_C_O
  26  AC_PROG_CC
  27  AC_PROG_INSTALL
  28  AC_PROG_LN_S
  29 diff -uNr clamav-0.98.3/m4/reorganization/clamdtop.m4 clamav-0.98.3-ac2.68/m4/reorganization/clamdtop.m4
  30 --- clamav-0.98.3/m4/reorganization/clamdtop.m4 2014-05-06 20:39:56.000000000 +0200
  31 +++ clamav-0.98.3-ac2.68/m4/reorganization/clamdtop.m4  2014-05-09 10:51:06.963907781 +0200
  32 @@ -6,8 +6,8 @@
  33  if test "$enable_clamdtop" != "no"; then
  34
  35  AC_LIB_FIND([ncurses], [ncurses/ncurses.h],
  36 -           AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
  37 -                           [initscr(); KEY_RESIZE;]),
  38 +           [AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
  39 +                           [initscr(); KEY_RESIZE;])],
  40             [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
  41              CURSES_INCLUDE="<ncurses/ncurses.h>"],
  42             [])
  43 @@ -15,8 +15,8 @@
  44  if test "X$HAVE_LIBNCURSES" != "Xyes"; then
  45      HAVE_LIBNCURSES=
  46      AC_LIB_FIND([ncurses], [ncurses.h],
  47 -           AC_LANG_PROGRAM([#include <ncurses.h>],
  48 -                           [initscr(); KEY_RESIZE;]),
  49 +           [AC_LANG_PROGRAM([#include <ncurses.h>],
  50 +                           [initscr(); KEY_RESIZE;])],
  51             [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
  52              CURSES_INCLUDE="<ncurses.h>"],
  53             [])
  54 @@ -24,8 +24,8 @@
  55
  56  if test "X$HAVE_LIBNCURSES" != "Xyes"; then
  57      AC_LIB_FIND([pdcurses],[curses.h],
  58 -                           AC_LANG_PROGRAM([#include <curses.h>],
  59 -                                           [initscr(); KEY_RESIZE;]),
  60 +                           [AC_LANG_PROGRAM([#include <curses.h>],
  61 +                                           [initscr(); KEY_RESIZE;])],
  62                             [CURSES_CPPFLAGS="$INCPDCURSES";
  63                              CURSES_LIBS="$LTLIBPDCURSES";
  64                              CURSES_INCLUDE="<curses.h>"],
  65 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
  66 --- clamav-0.98.3/m4/reorganization/code_checks/unit_tests.m4   2014-05-06 20:39:56.000000000 +0200
  67 +++ clamav-0.98.3-ac2.68/m4/reorganization/code_checks/unit_tests.m4    2014-05-09 10:51:06.963907781 +0200
  68 @@ -12,7 +12,7 @@
  69  esac
  70
  71         AC_LIB_FIND([check],[check.h],
  72 -                       AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)]),
  73 +                       [AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)])],
  74                         [CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK $LDFLAGS"],
  75                         [])
  76