X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmemcmp.m4;h=f3600ff502240fb07c25159baff65c2521e9fcac;hb=6da2fb7a5a1e8a32ccd2f735834713a3bc8c4275;hp=1de340938bd8ab3aeeb54f5704241b56c45f2003;hpb=6fe8d7498529e40705598c70355fd2f38efc7aea;p=gnulib.git

diff --git a/m4/memcmp.m4 b/m4/memcmp.m4
index 1de340938..f3600ff50 100644
--- a/m4/memcmp.m4
+++ b/m4/memcmp.m4
@@ -1,9 +1,31 @@
-#serial 7
+# 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([jm_FUNC_MEMCMP],
-[AC_REQUIRE([AC_FUNC_MEMCMP])dnl
- if test $ac_cv_func_memcmp_working = no; then
-   AC_DEFINE(memcmp, rpl_memcmp,
-     [Define to rpl_memcmp if the replacement function should be used.])
- fi
+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
+    AC_DEFINE([memcmp], [rpl_memcmp],
+      [Define to rpl_memcmp if the replacement function should be used.])
+    gl_PREREQ_MEMCMP
+  fi
 ])
+
+# Prerequisites of lib/memcmp.c.
+AC_DEFUN([gl_PREREQ_MEMCMP], [:])