@@ -320,12 +320,6 @@ int cli_scanmscab(cli_ctx *ctx, off_t sfx_offset)

 	memset(&ops_ex, 0, sizeof(struct mspack_system_ex));

  	ops_ex.ops = mspack_sys_fmap_ops;

-	MSPACK_SYS_SELFTEST(ret);

-	if (ret) {

-		cli_dbgmsg("%s() failed at %d\n", __func__, __LINE__);

-		return CL_EUNPACK;

-	}

-

 	cab_d = mspack_create_cab_decompressor(&ops_ex.ops);

 	if (!cab_d) {

 		cli_dbgmsg("%s() failed at %d\n", __func__, __LINE__);

@@ -427,12 +421,6 @@ int cli_scanmschm(cli_ctx *ctx)

 	memset(&ops_ex, 0, sizeof(struct mspack_system_ex));

  	ops_ex.ops = mspack_sys_fmap_ops;

-	MSPACK_SYS_SELFTEST(ret);

-	if (ret) {

-		cli_dbgmsg("%s() failed at %d\n", __func__, __LINE__);

-		return CL_EUNPACK;

-	}

-

 	mschm_d = mspack_create_chm_decompressor(&ops_ex.ops);

 	if (!mschm_d) {

 		cli_dbgmsg("%s() failed at %d\n", __func__, __LINE__);

@@ -1,9 +1,16 @@

 AC_MSG_CHECKING([LFS safe fts implementation])

-AC_TRY_COMPILE([

-	        #include <fts.h>

-	], [ fts_open((void *)0, FTS_PHYSICAL, (void *)0);],

-	[ have_LFS_fts=yes ],

-	[ have_LFS_fts=no]

+AC_TRY_RUN( [

+#include <fts.h>

+

+int main(void) {

+    fts_open((void *)0, FTS_PHYSICAL, (void *)0);

+

+    return 0;

+}

+],

+[have_LFS_fts=yes],

+[have_LFS_fts=no],

+[have_LFS_fts=no]

 )

 AC_MSG_RESULT([$have_LFS_fts])

 AM_CONDITIONAL([SYSTEM_LFS_FTS], [test "x$have_LFS_fts" = "xyes"])

@@ -24,6 +24,6 @@ int main(void) {

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

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

-CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"

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

 fi

 AC_MSG_RESULT([$enable_stat64])

@@ -3,6 +3,7 @@ m4_include([libclamav/libmspack-0.5alpha/m4/libmspack-opts.m4])

 if test "x$system_libmspack" = "xno"; then

     use_internal_mspack=yes

     AM_CONDITIONAL([USE_INTERNAL_MSPACK], test TRUE)

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

 else

     PKG_CHECK_MODULES([LIBMSPACK], [libmspack],

                         use_internal_mspack=no, use_internal_mspack=yes)