From: Jim Meyering Date: Fri, 16 Apr 2004 08:26:03 +0000 (+0000) Subject: (jm_PREREQ_STAT): Remove macro. It is specific to coreutils' stat program. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d9a0a33ef60f6b760d76637b658b3d38e5b5810;p=pspp (jm_PREREQ_STAT): Remove macro. It is specific to coreutils' stat program. (gl_PREREQ): Don't require jm_PREREQ_STAT. --- diff --git a/m4/prereq.m4 b/m4/prereq.m4 index c7b39b3250..4c406d11fc 100644 --- a/m4/prereq.m4 +++ b/m4/prereq.m4 @@ -1,4 +1,4 @@ -#serial 37 +#serial 38 dnl We use jm_ for non Autoconf macros. m4_pattern_forbid([^jm_[ABCDEFGHIJKLMNOPQRSTUVXYZ]])dnl @@ -120,54 +120,7 @@ AC_DEFUN([jm_PREREQ], AC_REQUIRE([AC_FUNC_REALLOC]) AC_REQUIRE([jm_FUNC_STAT]) AC_REQUIRE([jm_FUNC_UTIME]) - AC_REQUIRE([jm_PREREQ_STAT]) AC_REQUIRE([jm_XSTRTOIMAX]) AC_REQUIRE([jm_XSTRTOUMAX]) AC_REQUIRE([vb_FUNC_RENAME]) ]) - -AC_DEFUN([jm_PREREQ_STAT], -[ - AC_CHECK_HEADERS(sys/sysmacros.h sys/statvfs.h sys/vfs.h inttypes.h) - AC_CHECK_HEADERS(sys/param.h sys/mount.h) - AC_CHECK_FUNCS(statvfs) - - # For `struct statfs' on Ultrix 4.4. - AC_CHECK_HEADERS([netinet/in.h nfs/nfs_clnt.h nfs/vfs.h],,, - [AC_INCLUDES_DEFAULT]) - - AC_REQUIRE([jm_AC_TYPE_LONG_LONG]) - - statxfs_includes="\ -$ac_includes_default -#if HAVE_SYS_STATVFS_H -# include -#endif -#if HAVE_SYS_VFS_H -# include -#endif -#if !HAVE_SYS_STATVFS_H && !HAVE_SYS_VFS_H -# if HAVE_SYS_MOUNT_H && HAVE_SYS_PARAM_H -/* NetBSD 1.5.2 needs these, for the declaration of struct statfs. */ -# include -# include -# elif HAVE_NETINET_IN_H && HAVE_NFS_NFS_CLNT_H && HAVE_NFS_VFS_H -/* Ultrix 4.4 needs these for the declaration of struct statfs. */ -# include -# include -# include -# endif -#endif -" - AC_CHECK_MEMBERS([struct statfs.f_basetype],,,[$statxfs_includes]) - AC_CHECK_MEMBERS([struct statvfs.f_basetype],,,[$statxfs_includes]) - AC_CHECK_MEMBERS([struct statfs.f_fstypename],,,[$statxfs_includes]) - AC_CHECK_MEMBERS([struct statfs.f_type],,,[$statxfs_includes]) - AC_CHECK_MEMBERS([struct statvfs.f_type],,,[$statxfs_includes]) - AC_CHECK_MEMBERS([struct statfs.f_fsid.__val],,,[$statxfs_includes]) - AC_CHECK_MEMBERS([struct statvfs.f_fsid.__val],,,[$statxfs_includes]) - AC_CHECK_MEMBERS([struct statfs.f_namemax],,,[$statxfs_includes]) - AC_CHECK_MEMBERS([struct statvfs.f_namemax],,,[$statxfs_includes]) - AC_CHECK_MEMBERS([struct statfs.f_namelen],,,[$statxfs_includes]) - AC_CHECK_MEMBERS([struct statvfs.f_namelen],,,[$statxfs_includes]) -])