X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmemcmp.m4;h=171f4144f7b8f31554fcec9be541b970248b50ac;hb=e97aef06cc1a15e527c00cfa7c4e2f2466a9922f;hp=3e85fb8f6c168db2f229245f10906ae7d868b207;hpb=c4da5fc90ff7ff8ef395c84be4b14e0a3d404cbb;p=gnulib.git

diff --git a/m4/memcmp.m4 b/m4/memcmp.m4
index 3e85fb8f6..171f4144f 100644
--- a/m4/memcmp.m4
+++ b/m4/memcmp.m4
@@ -1,16 +1,27 @@
-# memcmp.m4 serial 10
-dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# memcmp.m4 serial 14
+dnl Copyright (C) 2002-2004, 2007-2009 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],
 [
-  AC_REQUIRE([AC_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
-    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