X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fjm-macros.m4;h=cbe58ef1afd3995b86057dfda56481742dbdaae8;hb=78d9ed8a349e9cb67f17a3b6abf922ee2d58e892;hp=becededa4e4cbb97d8dc7833d488a3bd8c325d73;hpb=705819c0cbf0286f3e32032a0d1a07b4c74ea782;p=gnulib.git

diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index becededa4..cbe58ef1a 100644
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -1,4 +1,4 @@
-#serial 18
+#serial 22
 
 dnl Misc type-related macros for fileutils, sh-utils, textutils.
 
@@ -74,11 +74,11 @@ AC_DEFUN(jm_MACROS,
   AC_REQUIRE([jm_FUNC_CHOWN])
   AC_REQUIRE([jm_FUNC_MKTIME])
   AC_REQUIRE([jm_FUNC_LSTAT])
-  AC_REQUIRE([jm_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
+  AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK])
   AC_REQUIRE([jm_FUNC_STAT])
   AC_REQUIRE([jm_FUNC_REALLOC])
   AC_REQUIRE([jm_FUNC_MALLOC])
-  AC_REQUIRE([jm_FUNC_STRERROR_R])
+  AC_REQUIRE([AC_FUNC_STRERROR_R])
   AC_REQUIRE([jm_FUNC_NANOSLEEP])
   AC_REQUIRE([jm_FUNC_READDIR])
   AC_REQUIRE([jm_FUNC_MEMCMP])
@@ -98,7 +98,7 @@ AC_DEFUN(jm_MACROS,
 
   AC_REQUIRE([AC_FUNC_VPRINTF])
   AC_REQUIRE([AC_FUNC_ALLOCA])
-  AC_REQUIRE([AM_FUNC_GETLOADAVG])
+  AC_FUNC_GETLOADAVG([lib])
   AC_REQUIRE([jm_SYS_PROC_UPTIME])
   AC_REQUIRE([jm_FUNC_FTRUNCATE])
 
@@ -107,9 +107,10 @@ AC_DEFUN(jm_MACROS,
   AC_REPLACE_FUNCS(gethostname getusershell)
   AC_REPLACE_FUNCS(stime strcspn stpcpy strstr strtol strtoul)
   AC_REPLACE_FUNCS(strpbrk)
-  AC_REPLACE_FUNCS(euidaccess memcmp mkdir rmdir rpmatch strndup strverscmp)
+  AC_REPLACE_FUNCS(euidaccess memcmp rmdir rpmatch strndup strverscmp)
   AC_REPLACE_FUNCS(atexit)
   AC_REPLACE_FUNCS(strnlen)
+  AC_REPLACE_FUNCS(getpass)
 
   dnl used by e.g. intl/*domain.c and lib/canon-host.c
   AC_REPLACE_FUNCS(strdup)
@@ -188,7 +189,7 @@ AC_DEFUN(jm_MACROS,
   test $am_cv_func_strtod_needs_libm = yes && POW_LIBM=-lm
 
   jm_LANGINFO_CODESET
-
+  jm_GLIBC21
   jm_ICONV
 
   # These tests are for df.