X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fmemcmp.m4;h=c0e9265dac0fbc236324ce9eb2132652463f509c;hb=820ad111e4c5b7877f18f29246059c86ee70351d;hp=4442e47b6945300103ffb255dc32eb78502a76cb;hpb=e059c2358aad79ce8dfd9581dd6f12ce8503dc63;p=gnulib.git

diff --git a/m4/memcmp.m4 b/m4/memcmp.m4
index 4442e47b6..c0e9265da 100644
--- a/m4/memcmp.m4
+++ b/m4/memcmp.m4
@@ -1,22 +1,31 @@
-# memcmp.m4 serial 8
-dnl Copyright (C) 2002 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-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([jm_FUNC_MEMCMP],
+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
 ])
 
 # Prerequisites of lib/memcmp.c.
-AC_DEFUN([gl_PREREQ_MEMCMP], [
-  AC_CHECK_HEADERS_ONCE(string.h)
-])
+AC_DEFUN([gl_PREREQ_MEMCMP], [:])