X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmemcmp.m4;h=7fdfe9ad709a909a4a837aec74312c726c40750e;hb=a412b69049907adc172f3dfaddf51e1e5a12c3d2;hp=82b4b7cc862d93ec47903d51ff2cc05352ba2372;hpb=4d79a4bf952f54c82ac41e88c7b1c40365c0d004;p=gnulib.git

diff --git a/m4/memcmp.m4 b/m4/memcmp.m4
index 82b4b7cc8..7fdfe9ad7 100644
--- a/m4/memcmp.m4
+++ b/m4/memcmp.m4
@@ -1,13 +1,12 @@
-#serial 2
+#serial 4
 
 dnl A replacement for autoconf's AC_FUNC_MEMCMP that detects
 dnl the losing memcmp on some x86 Next systems.
 AC_DEFUN(jm_AC_FUNC_MEMCMP,
 [AC_CACHE_CHECK([for working memcmp], jm_cv_func_memcmp_working,
 [AC_TRY_RUN(
-changequote(<<, >>)dnl
-<<
-main()
+[int
+main ()
 {
   /* Some versions of memcmp are not 8-bit clean.  */
   char c0 = 0x40, c1 = 0x80, c2 = 0x81;
@@ -32,24 +31,19 @@ main()
       }
     exit (0);
   }
-}
->>,
-changequote([, ])dnl
+}],
    jm_cv_func_memcmp_working=yes,
    jm_cv_func_memcmp_working=no,
    jm_cv_func_memcmp_working=no)])
-test $jm_cv_func_memcmp_working = no && LIBOBJS="$LIBOBJS memcmp.o"
+test $jm_cv_func_memcmp_working = no \
+  && LIBOBJS="$LIBOBJS memcmp.$ac_objext"
 AC_SUBST(LIBOBJS)dnl
 ])
 
-dnl If you use this macro in a package, you should
-dnl add the following two lines to acconfig.h:
-dnl   /* Define to rpl_memcmp if the replacement function should be used.  */
-dnl   #undef memcmp
-dnl
 AC_DEFUN(jm_FUNC_MEMCMP,
 [AC_REQUIRE([jm_AC_FUNC_MEMCMP])dnl
  if test $jm_cv_func_memcmp_working = no; then
-   AC_DEFINE_UNQUOTED(memcmp, rpl_memcmp)
+   AC_DEFINE_UNQUOTED(memcmp, rpl_memcmp,
+     [Define to rpl_memcmp if the replacement function should be used.])
  fi
 ])