.

4 files changed, 5 insertions, 33 deletions

diff --git a/m4/ChangeLog b/m4/ChangeLog
index a712e047d..d233d8a56 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-26  Jim Meyering  <meyering@lucent.com>
+
+	* jm-macros.m4 (jm_MACROS): Require autoconf-2.52g.
+	* strnlen.m4: Remove file, now that it's part of autoconf.
+
 2002-01-22  Paul Eggert  <eggert@twinsun.com>
 
 	* jm-macros.m4 (jm_MACROS): Require AC_FUNC_FSEEKO.
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 6acb86edf..098b19e32 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -69,7 +69,6 @@ st_mtim.m4 \
 stat.m4 \
 strerror_r.m4 \
 strftime.m4 \
-strnlen.m4 \
 timespec.m4 \
 unlink-busy.m4 \
 uptime.m4 \
diff --git a/m4/Makefile.in b/m4/Makefile.in
index 68e70b213..7528b7c4e 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -182,7 +182,6 @@ st_mtim.m4 \
 stat.m4 \
 strerror_r.m4 \
 strftime.m4 \
-strnlen.m4 \
 timespec.m4 \
 unlink-busy.m4 \
 uptime.m4 \
diff --git a/m4/strnlen.m4 b/m4/strnlen.m4
deleted file mode 100644
index a5bd2ef00..000000000
--- a/m4/strnlen.m4
+++ /dev/null
@@ -1,31 +0,0 @@
-#serial 1
-
-# This is already in cvs autoconf -- what will be 2.52g.
-# Define it here for those who aren't on the bleeding edge.
-# FIXME: remove this file once the next autoconf release comes out.
-
-undefine([AC_FUNC_STRNLEN])
-
-# AC_FUNC_STRNLEN
-# --------------
-AC_DEFUN([AC_FUNC_STRNLEN],
-[AC_CACHE_CHECK([for working strnlen], ac_cv_func_strnlen_working,
-[AC_RUN_IFELSE([AC_LANG_PROGRAM([], [[
-#define S "foobar"
-#define S_LEN (sizeof S - 1)
-
-  /* At least one implementation is buggy: that of AIX 4.3.  */
-  int i;
-  for (i = 0; i < S_LEN + 1; ++i)
-    {
-      int result = i <= S_LEN ? i : S_LEN;
-      if (strnlen (S, i) != result)
-	exit (1);
-    }
-  exit (0);
-]])],
-               [ac_cv_func_strnlen_working=yes],
-               [ac_cv_func_strnlen_working=no],
-               [ac_cv_func_strnlen_working=no])])
-test $ac_cv_func_strnlen_working = no && AC_LIBOBJ([strnlen])
-])# AC_FUNC_STRNLEN