ac2.68.patch

   1 diff -urNp -x '*.orig' clamav-0.103.0.org/configure.ac clamav-0.103.0/configure.ac
   2 --- clamav-0.103.0.org/configure.ac     2020-09-13 02:27:09.000000000 +0200
   3 +++ clamav-0.103.0/configure.ac 2021-04-06 16:39:49.284297541 +0200
   4 @@ -50,6 +50,7 @@ dnl the date in the version
   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 @@ -58,7 +59,6 @@ PKG_PROG_PKG_CONFIG(0.16)
  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 @@ -394,7 +394,7 @@ if test "X$have_json" = "Xyes" && test "
  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.
  29 diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/build_tools.m4 clamav-0.103.0/m4/reorganization/build_tools.m4
  30 --- clamav-0.103.0.org/m4/reorganization/build_tools.m4 2020-09-13 02:27:10.000000000 +0200
  31 +++ clamav-0.103.0/m4/reorganization/build_tools.m4     2021-04-06 16:39:49.284297541 +0200
  32 @@ -1,3 +1,5 @@
  33 +AM_PROG_AR
  34 +AM_PROG_CC_C_O
  35  AC_PROG_CC
  36  AM_PROG_LEX
  37  AC_PROG_YACC
  38 diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/clamdtop.m4 clamav-0.103.0/m4/reorganization/clamdtop.m4
  39 --- clamav-0.103.0.org/m4/reorganization/clamdtop.m4    2020-09-13 02:27:10.000000000 +0200
  40 +++ clamav-0.103.0/m4/reorganization/clamdtop.m4        2021-04-06 16:39:49.284297541 +0200
  41 @@ -13,8 +13,8 @@ PKG_CHECK_MODULES(NCURSES, [ncurses], [
  42
  43  if test "X$HAVE_LIBNCURSES" != "Xyes"; then
  44      AC_LIB_FIND([ncurses], [ncurses/ncurses.h],
  45 -           AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
  46 -                           [initscr(); KEY_RESIZE;]),
  47 +           [AC_LANG_PROGRAM([#include <ncurses/ncurses.h>],
  48 +                           [initscr(); KEY_RESIZE;])],
  49             [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
  50              CURSES_INCLUDE="<ncurses/ncurses.h>"],
  51             [])
  52 @@ -23,8 +23,8 @@ fi
  53  if test "X$HAVE_LIBNCURSES" != "Xyes"; then
  54      HAVE_LIBNCURSES=
  55      AC_LIB_FIND([ncurses], [ncurses.h],
  56 -           AC_LANG_PROGRAM([#include <ncurses.h>],
  57 -                           [initscr(); KEY_RESIZE;]),
  58 +           [AC_LANG_PROGRAM([#include <ncurses.h>],
  59 +                           [initscr(); KEY_RESIZE;])],
  60             [CURSES_CPPFLAGS="$INCNCURSES"; CURSES_LIBS="$LTLIBNCURSES";
  61              CURSES_INCLUDE="<ncurses.h>"],
  62             [])
  63 @@ -32,8 +32,8 @@ fi
  64
  65  if test "X$HAVE_LIBNCURSES" != "Xyes"; then
  66      AC_LIB_FIND([pdcurses],[curses.h],
  67 -                           AC_LANG_PROGRAM([#include <curses.h>],
  68 -                                           [initscr(); KEY_RESIZE;]),
  69 +                           [AC_LANG_PROGRAM([#include <curses.h>],
  70 +                                           [initscr(); KEY_RESIZE;])],
  71                             [CURSES_CPPFLAGS="$INCPDCURSES";
  72                              CURSES_LIBS="$LTLIBPDCURSES";
  73                              CURSES_INCLUDE="<curses.h>"],
  74 diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/code_checks/unit_tests.m4 clamav-0.103.0/m4/reorganization/code_checks/unit_tests.m4
  75 --- clamav-0.103.0.org/m4/reorganization/code_checks/unit_tests.m4      2020-09-13 02:27:10.000000000 +0200
  76 +++ clamav-0.103.0/m4/reorganization/code_checks/unit_tests.m4  2021-04-06 16:39:49.284297541 +0200
  77 @@ -19,7 +19,7 @@ case "$host_os" in
  78  esac
  79
  80         AC_LIB_FIND([check],[check.h],
  81 -                       AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)]),
  82 +                       [AC_LANG_PROGRAM([#include <check.h>],[srunner_create(0)])],
  83                         [CHECK_CPPFLAGS="$INCCHECK"; CHECK_LIBS="$LTLIBCHECK $LDFLAGS"],
  84                         [])
  85
  86 diff -urNp -x '*.orig' clamav-0.103.0.org/m4/reorganization/libs/curl.m4 clamav-0.103.0/m4/reorganization/libs/curl.m4
  87 --- clamav-0.103.0.org/m4/reorganization/libs/curl.m4   2020-09-13 02:27:10.000000000 +0200
  88 +++ clamav-0.103.0/m4/reorganization/libs/curl.m4       2021-04-06 16:39:49.284297541 +0200
  89 @@ -64,12 +64,12 @@ if test "X$have_curl" = "Xyes"; then
  90      dnl end of section
  91
  92      AM_COND_IF([BUILD_CLAMONACC],
  93 -        $enable_clamonacc="yes"
  94 +        enable_clamonacc="yes"
  95
  96 -        clamonacc_curl = "current"
  97 +        clamonacc_curl="current"
  98          dnl if version less than to (7.40 0x072800)
  99          [if test $curl_version -lt 468992; then
 100 -          clamonacc_curl = "deprecated"
 101 +          clamonacc_curl="deprecated"
 102          fi]
 103      )
 104