@@ -854,7 +854,6 @@ enable_dns_fix

 enable_bigstack

 with_dbdir

 enable_readdir_r

-enable_stat64

 enable_fdpassing

 enable_clamdtop

 with_libncurses_prefix

@@ -1531,7 +1530,6 @@ Optional Features:

   --enable-dns-fix	  enable workaround for broken DNS servers (as in SpeedTouch 510)

   --enable-bigstack	  increase thread stack size

   --enable-readdir_r		    enable support for readdir_r

   --disable-fdpassing        don't build file descriptor passing support

   --enable-clamdtop       Enable 'clamdtop' tool [default=auto]

   --enable-distcheck-werror

@@ -18738,11 +18736,40 @@ cat >>confdefs.h <<_ACEOF

 _ACEOF

-# Check whether --enable-stat64 was given.

-if test "${enable_stat64+set}" = set; then :

-  enableval=$enable_stat64; enable_stat64=$enableval

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stat64" >&5

+$as_echo_n "checking stat64... " >&6; }

+if test "$cross_compiling" = yes; then :

+  enable_stat64=no

+else

+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h.  */

+

+#define _LARGEFILE_SOURCE

+#define _LARGEFILE64_SOURCE

+#define _FILE_OFFSET_BITS 64

+#include <stdio.h>

+#include <sys/types.h>

+#include <sys/stat.h>

+#include <unistd.h>

+#include <errno.h>

+

+int main(void) {

+    struct stat64 sb;

+

+    if (stat64(".", &sb) == -1)

+        return errno;

+

+    return 0;

+}

+

+_ACEOF

+if ac_fn_c_try_run "$LINENO"; then :

+  enable_stat64=yes

 else

-  enable_stat64="no"

+  enable_stat64=no

+fi

+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \

+  conftest.$ac_objext conftest.beam conftest.$ac_ext

 fi

@@ -18752,6 +18779,8 @@ $as_echo "#define HAVE_STAT64 1" >>confdefs.h

 CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"

 fi

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_stat64" >&5

+$as_echo "$enable_stat64" >&6; }

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether signed right shift is sign extended" >&5

 $as_echo_n "checking whether signed right shift is sign extended... " >&6; }

@@ -1491,13 +1491,36 @@ DEFAULT_FD_SETSIZE=256)

 AC_MSG_RESULT([$DEFAULT_FD_SETSIZE])

 AC_DEFINE_UNQUOTED([DEFAULT_FD_SETSIZE], $DEFAULT_FD_SETSIZE, "default FD_SETSIZE value")

-AC_ARG_ENABLE([stat64], [--enable-stat64]          enable support for stat64],

-              enable_stat64=$enableval, enable_stat64="no")

+AC_MSG_CHECKING([stat64])

+AC_TRY_RUN([

+#define _LARGEFILE_SOURCE

+#define _LARGEFILE64_SOURCE

+#define _FILE_OFFSET_BITS 64

+#include <stdio.h>

+#include <sys/types.h>

+#include <sys/stat.h>

+#include <unistd.h>

+#include <errno.h>

+

+int main(void) {

+    struct stat64 sb;

+

+    if (stat64(".", &sb) == -1)

+        return errno;

+

+    return 0;

+}

+],

+[enable_stat64=yes],

+[enable_stat64=no],

+[enable_stat64=no],

+)

 if test "$enable_stat64" != "no"; then

 AC_DEFINE([HAVE_STAT64],1,[enable stat64])

 CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"

 fi

+AC_MSG_RESULT([$enable_stat64])

 dnl Check signed right shift implementation

 AC_MSG_CHECKING([whether signed right shift is sign extended])

@@ -695,8 +695,7 @@ libclamav_la_SOURCES = clamav.h matcher-ac.c matcher-ac.h matcher-bm.c \

 	tomsfastmath/bin/fp_signed_bin_size.c \

 	tomsfastmath/bin/fp_to_signed_bin.c \

 	tomsfastmath/bin/fp_to_unsigned_bin.c \

-	tomsfastmath/bin/fp_toradix.c \

-	tomsfastmath/bin/fp_toradix_n.c \

+	tomsfastmath/bin/fp_toradix.c tomsfastmath/bin/fp_toradix_n.c \

 	tomsfastmath/bin/fp_unsigned_bin_size.c \

 	tomsfastmath/bit/fp_cnt_lsb.c tomsfastmath/bit/fp_count_bits.c \

 	tomsfastmath/bit/fp_div_2.c tomsfastmath/bit/fp_div_2d.c \