X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmemcmp.m4;h=c0e9265dac0fbc236324ce9eb2132652463f509c;hb=0167c1923d0791e0e1491a856292b0945621c4e2;hp=099b141b2c1e985a6bcfac1324ef09ecc37ace05;hpb=f67b37c4af9923c0c70cf79d9b56b7fbcf2c97c3;p=gnulib.git

diff --git a/m4/memcmp.m4 b/m4/memcmp.m4
index 099b141b2..c0e9265da 100644
--- a/m4/memcmp.m4
+++ b/m4/memcmp.m4
@@ -1,15 +1,27 @@
-# memcmp.m4 serial 12
-dnl Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc.
+# memcmp.m4 serial 14
+dnl Copyright (C) 2002-2004, 2007-2010 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).
+  dnl Note: AC_FUNC_MEMCMP does AC_LIBOBJ([memcmp]).
   if test $ac_cv_func_memcmp_working = no; then
-    AC_DEFINE(memcmp, rpl_memcmp,
+    AC_DEFINE([memcmp], [rpl_memcmp],
       [Define to rpl_memcmp if the replacement function should be used.])
     gl_PREREQ_MEMCMP
   fi