X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fjm-macros.m4;h=788a16f6573aa512c0bc11237e20e326f1c66296;hb=2bf674b2395b6aff54eff7928d24f2995c37c28e;hp=00e04adc1726c8cc1e754722b39d8a6ef02c7d2e;hpb=a3ce815dcaff8b2bd5f192293cdce1d75ec942e6;p=gnulib.git

diff --git a/m4/jm-macros.m4 b/m4/jm-macros.m4
index 00e04adc1..788a16f65 100644
--- a/m4/jm-macros.m4
+++ b/m4/jm-macros.m4
@@ -1,10 +1,10 @@
-#serial 42   -*- autoconf -*-
+#serial 48   -*- autoconf -*-
 
 dnl Misc type-related macros for fileutils, sh-utils, textutils.
 
 AC_DEFUN([jm_MACROS],
 [
-  AC_PREREQ(2.52f)
+  AC_PREREQ(2.52g)
 
   GNU_PACKAGE="GNU $PACKAGE"
   AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE",
@@ -35,6 +35,7 @@ AC_DEFUN([jm_MACROS],
   AC_REQUIRE([jm_PREREQ])
 
   AC_REQUIRE([UTILS_FUNC_DIRFD])
+  AC_REQUIRE([AC_FUNC_ACL])
   AC_REQUIRE([jm_FUNC_LCHOWN])
   AC_REQUIRE([fetish_FUNC_RMDIR_NOTEMPTY])
   AC_REQUIRE([jm_FUNC_CHOWN])
@@ -49,7 +50,7 @@ AC_DEFUN([jm_MACROS],
   AC_REQUIRE([jm_FUNC_READDIR])
   AC_REQUIRE([jm_FUNC_MEMCMP])
   AC_REQUIRE([jm_FUNC_GLIBC_UNLOCKED_IO])
-  AC_REQUIRE([jm_FUNC_FNMATCH])
+  AC_REQUIRE([AC_FUNC_FNMATCH_GNU])
   AC_REQUIRE([jm_FUNC_GROUP_MEMBER])
   AC_REQUIRE([jm_FUNC_PUTENV])
   AC_REQUIRE([jm_AFS])
@@ -64,6 +65,7 @@ AC_DEFUN([jm_MACROS],
   AC_REQUIRE([jm_FUNC_GETGROUPS])
   test -n "$GETGROUPS_LIB" && LIBS="$GETGROUPS_LIB $LIBS"
 
+  AC_REQUIRE([AC_FUNC_FSEEKO])
   AC_REQUIRE([AC_FUNC_VPRINTF])
   AC_REQUIRE([AC_FUNC_ALLOCA])
   AC_FUNC_GETLOADAVG([lib])
@@ -74,11 +76,11 @@ AC_DEFUN([jm_MACROS],
   AC_REPLACE_FUNCS(strcasecmp strncasecmp)
   AC_REPLACE_FUNCS(dup2)
   AC_REPLACE_FUNCS(gethostname getusershell)
-  AC_REPLACE_FUNCS(stime strcspn stpcpy strstr strtol strtoul)
+  AC_REPLACE_FUNCS(sig2str)
+  AC_REPLACE_FUNCS(strcspn stpcpy strstr strtol strtoul)
   AC_REPLACE_FUNCS(strpbrk)
   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
@@ -111,7 +113,7 @@ AC_DEFUN([jm_MACROS],
     AC_SEARCH_LIBS(clock_gettime, [rt posix4],
 		   [LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime])
     AC_SUBST(LIB_CLOCK_GETTIME)
-    AC_CHECK_FUNCS(clock_gettime)
+    AC_CHECK_FUNCS(clock_gettime clock_settime)
   LIBS=$fetish_saved_libs
   AC_CHECK_FUNCS(gettimeofday)
   AC_FUNC_GETTIMEOFDAY_CLOBBER
@@ -120,7 +122,6 @@ AC_DEFUN([jm_MACROS],
   AC_REQUIRE([jm_FUNC_UTIME])
 
   AC_CHECK_FUNCS( \
-    acl \
     bcopy \
     canonicalize_file_name \
     endgrent \
@@ -188,7 +189,7 @@ AC_DEFUN([jm_MACROS],
   jm_FSTYPENAME
   jm_FILE_SYSTEM_USAGE([space=yes], [space=no])
   if test $list_mounted_fs = yes && test $space = yes; then
-    DF_PROG="df"
+    DF_PROG=df
     AC_LIBOBJ(fsusage)
     AC_LIBOBJ(mountlist)
   fi
@@ -206,6 +207,7 @@ AC_DEFUN([jm_CHECK_ALL_HEADERS],
     fcntl.h \
     fenv.h \
     float.h \
+    hurd.h \
     limits.h \
     memory.h \
     mntent.h \
@@ -216,7 +218,6 @@ AC_DEFUN([jm_CHECK_ALL_HEADERS],
     stddef.h \
     stdint.h \
     string.h \
-    sys/acl.h \
     sys/filsys.h \
     sys/fs/s5param.h \
     sys/fs_types.h \
@@ -245,11 +246,6 @@ AC_DEFUN([jm_CHECK_ALL_HEADERS],
 # This macro must be invoked before any tests that run the compiler.
 AC_DEFUN([jm_CHECK_ALL_TYPES],
 [
-  # FIXME: I shouldn't have to require this macro here.  Rather, it should
-  # be required by any autoconf macro that performs a compile-time test or
-  # otherwise uses confdefs.h.
-  AC_REQUIRE([AC__GNU_SOURCE])
-
   dnl This test must come as early as possible after the compiler configuration
   dnl tests, because the choice of the file model can (in principle) affect
   dnl whether functions and headers are available, whether they work, etc.
@@ -262,7 +258,6 @@ AC_DEFUN([jm_CHECK_ALL_TYPES],
 
   dnl Checks for typedefs, structures, and compiler characteristics.
   AC_REQUIRE([AC_C_BIGENDIAN])
-  AC_REQUIRE([AC_PROG_CC_STDC])
   AC_REQUIRE([AC_C_CONST])
   AC_REQUIRE([AC_C_VOLATILE])
   AC_REQUIRE([AC_C_INLINE])
@@ -271,7 +266,10 @@ AC_DEFUN([jm_CHECK_ALL_TYPES],
   AC_REQUIRE([jm_CHECK_ALL_HEADERS])
   AC_REQUIRE([AC_HEADER_DIRENT])
   AC_REQUIRE([AC_HEADER_STDC])
-  AC_CHECK_MEMBERS([struct stat.st_blksize],,,[$ac_includes_default
+  AC_CHECK_MEMBERS(
+    [struct stat.st_author,
+     struct stat.st_blksize],,,
+    [$ac_includes_default
 #include <sys/stat.h>
   ])
   AC_REQUIRE([AC_STRUCT_ST_BLOCKS])