When cross-compiling, assume memcmp works if it is declared.

diff --git a/ChangeLog b/ChangeLog
index b4ac63656f1dc5ad475790e5cf16d50975bf9cf9..7b1b86af289c2399d154391d1f51281a31822f27 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-21  Simon Josefsson  <simon@josefsson.org>
+
+       * m4/memcmp.m4: When cross-compiling, assume memcmp works if it is
+       declared.
+
 2008-05-20  Bruno Haible  <bruno@clisp.org>
 
        * tests/test-memcmp.c (main): Test also the sign of the result. Test

diff --git a/m4/memcmp.m4 b/m4/memcmp.m4
index 099b141b2c1e985a6bcfac1324ef09ecc37ace05..a8d87b930a7ac06f59265cdfbd79a5f4a242debe 100644 (file)
--- a/m4/memcmp.m4
+++ b/m4/memcmp.m4
@@ -1,11 +1,23 @@
-# memcmp.m4 serial 12
-dnl Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc.
+# memcmp.m4 serial 13
+dnl Copyright (C) 2002, 2003, 2004, 2007, 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
 AC_DEFUN([gl_FUNC_MEMCMP],
 [
+  if test $cross_compiling != no; then
+    # AC_FUNC_MEMCMP as of 2.62 defaults to 'no' when cross compiling.
+    # We default to yes if memcmp appears to exist, which works
+    # better for MinGW.
+    AC_CACHE_CHECK([whether cross-compiling target has memcmp],
+                   [ac_cv_func_memcmp_working],
+                   [AC_LINK_IFELSE([
+                       AC_LANG_PROGRAM([[#include <string.h>
+                               ]], [[int ret = memcmp ("foo", "bar", 0);]])],
+                       [ac_cv_func_memcmp_working=yes],
+                       [ac_cv_func_memcmp_working=no])])
+  fi 
   AC_FUNC_MEMCMP
   dnl Note: AC_FUNC_MEMCMP does AC_LIBOBJ(memcmp).
   if test $ac_cv_func_memcmp_working = no; then