@@ -139,6 +139,8 @@ m4_include([m4/reorganization/substitutions.m4])

 m4_include([m4/reorganization/libmspack.m4])

+m4_include([m4/reorganization/strni.m4])

+

 if test "x$use_internal_mspack" = "xyes"; then

     mspack_msg="Internal"

     AC_CONFIG_SUBDIRS([libclamav/libmspack-0.5alpha])

@@ -460,7 +460,7 @@ const char* cli_strcasestr(const char* a, const char *b)

 }

 #endif

-#ifndef HAVE_STRNLEN

+#if !defined(HAVE_STRNLEN) || defined(HAVE_STRNI)

 size_t cli_strnlen(const char *s, size_t n)

 {

     size_t i = 0;

@@ -469,7 +469,7 @@ size_t cli_strnlen(const char *s, size_t n)

 }

 #endif

-#ifndef HAVE_STRNDUP

+#if !defined(HAVE_STRNDUP) || defined(HAVE_STRNI)

 char *cli_strndup(const char *s, size_t n)

 {

     char *alloc;

@@ -33,13 +33,13 @@

 const char *cli_strcasestr(const char *haystack, const char *needle);

 #endif

-#ifdef HAVE_STRNDUP

+#if defined(HAVE_STRNDUP) && !defined(HAVE_STRNI)

 #define cli_strndup strndup

 #else

 char *cli_strndup(const char *s, size_t n);

 #endif

-#ifdef HAVE_STRNLEN

+#if defined(HAVE_STRNLEN) && !defined(HAVE_STRNI)

 #define cli_strnlen strnlen

 #else

 size_t cli_strnlen(const char *s, size_t n);

new file mode 100644

@@ -0,0 +1,12 @@

+

+AC_ARG_ENABLE([strni],

+[AS_HELP_STRING([--enable-strni],

+[enables explicit use of internal strn functions to support cross-compilation against older libs])],

+enable_strni=$enableval, enable_strni="no")

+

+if test "$enable_strni" = "yes"; then

+    AC_DEFINE([HAVE_STRNI],1,[using internal strn functions])

+    AC_SUBST([HAVE_STRNI])

+fi

+

+