X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmemcmp.m4;h=dcc22120f7999e6242c967fef0c0d0a803a10dc5;hb=c6f9e663d25b0980c51f609a3fe237deca168461;hp=a15e9b7985894252adc3200eff96f0bf1e6314e1;hpb=025fae6d61b82020179feb5c72d3747f1ce351c4;p=gnulib.git

diff --git a/m4/memcmp.m4 b/m4/memcmp.m4
index a15e9b798..dcc22120f 100644
--- a/m4/memcmp.m4
+++ b/m4/memcmp.m4
@@ -1,36 +1,14 @@
-# memcmp.m4 serial 15
-dnl Copyright (C) 2002-2004, 2007-2010 Free Software Foundation, Inc.
+# memcmp.m4 serial 16
+dnl Copyright (C) 2002-2004, 2007-2011 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
-    AC_DEFINE([memcmp], [rpl_memcmp],
-      [Define to rpl_memcmp if the replacement function should be used.])
-    gl_PREREQ_MEMCMP
-  fi
-])
-
-# Redefine AC_FUNC_MEMCMP, because it is no longer maintained in Autoconf.
-AC_DEFUN([AC_FUNC_MEMCMP],
-[
-  AC_CACHE_CHECK([for working memcmp], [ac_cv_func_memcmp_working],
+  dnl We don't use AC_FUNC_MEMCMP any more, because it is no longer maintained
+  dnl in Autoconf and because it invokes AC_LIBOBJ.
+  AC_CACHE_CHECK([for working memcmp], [gl_cv_func_memcmp_working],
     [AC_RUN_IFELSE(
        [AC_LANG_PROGRAM(
           [AC_INCLUDES_DEFAULT],
@@ -57,11 +35,26 @@ AC_DEFUN([AC_FUNC_MEMCMP],
               return 0;
             }
           ]])],
-       [ac_cv_func_memcmp_working=yes],
-       [ac_cv_func_memcmp_working=no],
-       [ac_cv_func_memcmp_working=no])])
-  test $ac_cv_func_memcmp_working = no &&
-    AC_LIBOBJ([memcmp])
+       [gl_cv_func_memcmp_working=yes],
+       [gl_cv_func_memcmp_working=no],
+       [dnl When cross-compiling, guess memcmp works when it exists.
+        dnl This is useful for mingw.
+        AC_LINK_IFELSE(
+          [AC_LANG_PROGRAM(
+             [[#include <string.h>]],
+             [[int ret = memcmp ("foo", "bar", 0);]])],
+          [gl_cv_func_memcmp_working="guessing yes"],
+          [gl_cv_func_memcmp_working="guessing no"])
+       ])
+    ])
+  case "$gl_cv_func_memcmp_working" in
+    *yes) gl_func_memcmp=yes ;;
+    *)    gl_func_memcmp=no ;;
+  esac
+  if test $gl_func_memcmp = no; then
+    AC_DEFINE([memcmp], [rpl_memcmp],
+      [Define to rpl_memcmp if the replacement function should be used.])
+  fi
 ])
 
 # Prerequisites of lib/memcmp.c.