New file. Imported from `configure.in' in GNU fileutils 3.16. It does all

* gnome-fileutils.m4 (GNOME_FILEUTILS_CHECKS): New file.
Imported from `configure.in' in GNU fileutils 3.16. It does
all the checks that are needed for the diskusage applet.

svn path=/trunk/; revision=229

1 files changed, 255 insertions, 409 deletions

diff --git a/macros/gnome-fileutils.m4 b/macros/gnome-fileutils.m4
index b25faa8789..df69d34fa0 100644
--- a/macros/gnome-fileutils.m4
+++ b/macros/gnome-fileutils.m4
@@ -1,157 +1,18 @@
-dnl Process this file with autoconf to produce a configure script.
-AC_INIT(src/ls.c)
-AM_CONFIG_HEADER(config.h)
-AC_PREREQ(2.12)dnl               dnl Minimum Autoconf version required.
-
-AM_INIT_AUTOMAKE([fileutils], [3.16])
-GNU_PACKAGE="GNU $PACKAGE"
-AC_DEFINE_UNQUOTED(GNU_PACKAGE, "$GNU_PACKAGE")
-
-AM_MAINTAINER_MODE
-
-ALL_LINGUAS="de es fr nl pl pt sl sv"
-
-AC_SUBST(DF_PROG)
-AC_SUBST(MVDIR_PROG)
-AC_PATH_PROG(LN, ln, ln)
-AC_PATH_PROG(MV, mv, mv)
-AC_PATH_PROG(RM, rm, rm)
-AC_PATH_PROG(PERL, perl)
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_GCC_TRADITIONAL
-AC_PROG_RANLIB
-AC_PROG_YACC
-AC_AIX
-AC_MINIX
-
-AM_WITH_REGEX
-
-dnl This test must precede tests of compiler characteristics like
-dnl that for the inline keyword, since it may change the degree to
-dnl which the compiler supports such features.
-AM_C_PROTOTYPES
-
-AC_HEADER_MAJOR
-AC_HEADER_DIRENT
-AC_FUNC_CLOSEDIR_VOID
-
-AC_TYPE_GETGROUPS
-AC_TYPE_MODE_T
-AC_TYPE_OFF_T
-AC_TYPE_SIGNAL
-AC_TYPE_SIZE_T
-AC_TYPE_UID_T
-AC_CHECK_TYPE(ino_t, unsigned long)
-
-AC_C_CONST
-AC_HEADER_STDC
-AC_STRUCT_TM
-AC_STRUCT_ST_BLOCKS
-AC_HEADER_TIME
-AC_HEADER_STAT
-
-dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
-AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
-
-AC_CHECK_HEADERS(string.h fcntl.h limits.h sys/time.h sys/timeb.h \
-    errno.h unistd.h \
-    sys/param.h sys/statfs.h sys/fstyp.h mnttab.h mntent.h utime.h \
-    sys/statvfs.h sys/vfs.h sys/mount.h sys/filsys.h sys/fs_types.h \
-    sys/wait.h sys/ioctl.h sys/fs/s5param.h values.h)
-AC_REPLACE_FUNCS(basename euidaccess memcpy memcmp memset)
-
-dnl Do this replacement check manually because I want the hyphen
-dnl (not the underscore) in the filename.
-AC_CHECK_FUNC(group_member, , [LIBOBJS="$LIBOBJS group-member.o"])
-
-dnl FIXME: uncomment the following when automake is fixed not to complain
-dnl FIXME: that mkdir.c/rmdir.c are (implicitly) mentioned in src/Makefile.am.
-dnl AC_REPLACE_FUNCS(mkdir rename rmdir rpmatch stpcpy strcasecmp strdup)
-
-dnl FIXME: KLUDGE: remove these three lines and uncomment the above
-dnl FIXME: when automake is fixed.
-AC_REPLACE_FUNCS(mkdir rmdir \
-)
-AC_REPLACE_FUNCS(rename rpmatch stpcpy strcasecmp strdup)
-
-AC_REPLACE_FUNCS(strndup strstr strtol strtoul)
-
-jm_FUNC_MKTIME
-jm_FUNC_GNU_STRFTIME
-
-AM_FUNC_GETLINE
-if test $am_cv_func_working_getline != yes; then
-  AC_CHECK_FUNCS(getdelim)
-fi
+dnl
+dnl GNOME_FILEUTILS_CHECKS
+dnl
+dnl checks that are needed for the diskusage applet.
+dnl
+
+AC_DEFUN([GNOME_FILEUTILS_CHECKS],
+[	
+AC_CHECK_HEADERS(fcntl.h sys/param.h sys/statfs.h sys/fstyp.h \
+mnttab.h mntent.h sys/statvfs.h sys/vfs.h sys/mount.h \
+sys/filsys.h sys/fs_types.h sys/fs/s5param.h)
 
 AC_CHECK_FUNCS(bcopy endgrent endpwent fchdir ftime ftruncate \
-    getcwd getmntinfo gettimeofday isascii lchown \
-    listmntent memcpy mkfifo strchr strerror strrchr)
-
-AM_FUNC_ERROR_AT_LINE
-AM_FUNC_OBSTACK
-AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL
-
-AC_FUNC_VPRINTF
-AC_FUNC_ALLOCA
-AC_FUNC_UTIME_NULL
-
-dnl Some systems have utime.h but don't declare the struct anywhere.
-AC_MSG_CHECKING(for struct utimbuf)
-AC_CACHE_VAL(fu_cv_sys_struct_utimbuf,
-[AC_TRY_COMPILE([#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-#ifdef HAVE_UTIME_H
-#include <utime.h>
-#endif], [static struct utimbuf x; x.actime = x.modtime;],
-  fu_cv_sys_struct_utimbuf=yes,
-  fu_cv_sys_struct_utimbuf=no)])
-AC_MSG_RESULT($fu_cv_sys_struct_utimbuf)
-if test $fu_cv_sys_struct_utimbuf = yes; then
-   AC_DEFINE(HAVE_STRUCT_UTIMBUF)
-fi
-
-AC_FUNC_FNMATCH
-if test $ac_cv_func_fnmatch_works = no; then
-  LIBOBJS="$LIBOBJS fnmatch.o"
-  AC_DEFINE_UNQUOTED(fnmatch, rpl_fnmatch)
-fi
-
-AC_MSG_CHECKING([for d_ino member in directory struct])
-AC_CACHE_VAL(fu_cv_sys_d_ino_in_dirent,
-[AC_TRY_LINK([
-#include <sys/types.h>
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#else /* not HAVE_DIRENT_H */
-# define dirent direct
-# ifdef HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif /* HAVE_SYS_NDIR_H */
-# ifdef HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif /* HAVE_SYS_DIR_H */
-# ifdef HAVE_NDIR_H
-#  include <ndir.h>
-# endif /* HAVE_NDIR_H */
-#endif /* HAVE_DIRENT_H */
-],
-  [struct dirent dp; dp.d_ino = 0;],
-    fu_cv_sys_d_ino_in_dirent=yes,
-    fu_cv_sys_d_ino_in_dirent=no)])
-AC_MSG_RESULT($fu_cv_sys_d_ino_in_dirent)
-if test $fu_cv_sys_d_ino_in_dirent = yes; then
-  AC_DEFINE(D_INO_IN_DIRENT)
-fi
+getcwd getmntinfo gettimeofday isascii lchown \
+listmntent memcpy mkfifo strchr strerror strrchr)
 
 # Determine how to get the list of mounted filesystems.
 list_mounted_fs=
@@ -170,172 +31,172 @@ AC_FUNC_GETMNTENT
 # function named listmntent to risk the false positive.
 
 if test -z "$list_mounted_fs"; then
-  # Cray UNICOS 9
-  AC_MSG_CHECKING([for listmntent of Cray/Unicos-9])
-  AC_CACHE_VAL(fu_cv_sys_mounted_cray_listmntent,
-    [fu_cv_sys_mounted_cray_listmntent=no
-      AC_EGREP_CPP(yes,
-        [#ifdef _CRAY
+# Cray UNICOS 9
+AC_MSG_CHECKING([for listmntent of Cray/Unicos-9])
+AC_CACHE_VAL(fu_cv_sys_mounted_cray_listmntent,
+[fu_cv_sys_mounted_cray_listmntent=no
+AC_EGREP_CPP(yes,
+[#ifdef _CRAY
 yes
 #endif
-        ], [test $ac_cv_func_listmntent = yes \
-	    && fu_cv_sys_mounted_cray_listmntent=yes]
-      )
-    ]
-  )
-  AC_MSG_RESULT($fu_cv_sys_mounted_cray_listmntent)
-  if test $fu_cv_sys_mounted_cray_listmntent = yes; then
-    list_mounted_fs=found
-    AC_DEFINE(MOUNTED_LISTMNTENT)
-  fi
+], [test $ac_cv_func_listmntent = yes \
+&& fu_cv_sys_mounted_cray_listmntent=yes]
+)
+]
+)
+AC_MSG_RESULT($fu_cv_sys_mounted_cray_listmntent)
+if test $fu_cv_sys_mounted_cray_listmntent = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_LISTMNTENT)
+fi
 fi
 
 if test $ac_cv_func_getmntent = yes; then
 
-  # This system has the getmntent function.
-  # Determine whether it's the one-argument variant or the two-argument one.
-
-  if test -z "$list_mounted_fs"; then
-    # 4.3BSD, SunOS, HP-UX, Dynix, Irix
-    AC_MSG_CHECKING([for one-argument getmntent function])
-    AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1,
-		 [test $ac_cv_header_mntent_h = yes \
-		   && fu_cv_sys_mounted_getmntent1=yes \
-		   || fu_cv_sys_mounted_getmntent1=no])
-    AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1)
-    if test $fu_cv_sys_mounted_getmntent1 = yes; then
-      list_mounted_fs=found
-      AC_DEFINE(MOUNTED_GETMNTENT1)
-    fi
-  fi
-
-  if test -z "$list_mounted_fs"; then
-    # SVR4
-    AC_MSG_CHECKING([for two-argument getmntent function])
-    AC_CACHE_VAL(fu_cv_sys_mounted_getmntent2,
-    [AC_EGREP_HEADER(getmntent, sys/mnttab.h,
-      fu_cv_sys_mounted_getmntent2=yes,
-      fu_cv_sys_mounted_getmntent2=no)])
-    AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2)
-    if test $fu_cv_sys_mounted_getmntent2 = yes; then
-      list_mounted_fs=found
-      AC_DEFINE(MOUNTED_GETMNTENT2)
-    fi
-  fi
-
-  if test -z "$list_mounted_fs"; then
-    AC_MSG_ERROR([could not determine how to read list of mounted filesystems])
-  fi
+# This system has the getmntent function.
+# Determine whether it's the one-argument variant or the two-argument one.
+
+if test -z "$list_mounted_fs"; then
+# 4.3BSD, SunOS, HP-UX, Dynix, Irix
+AC_MSG_CHECKING([for one-argument getmntent function])
+AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1,
+[test $ac_cv_header_mntent_h = yes \
+&& fu_cv_sys_mounted_getmntent1=yes \
+|| fu_cv_sys_mounted_getmntent1=no])
+AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1)
+if test $fu_cv_sys_mounted_getmntent1 = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_GETMNTENT1)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+# SVR4
+AC_MSG_CHECKING([for two-argument getmntent function])
+AC_CACHE_VAL(fu_cv_sys_mounted_getmntent2,
+[AC_EGREP_HEADER(getmntent, sys/mnttab.h,
+fu_cv_sys_mounted_getmntent2=yes,
+fu_cv_sys_mounted_getmntent2=no)])
+AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2)
+if test $fu_cv_sys_mounted_getmntent2 = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_GETMNTENT2)
+fi
+fi
+
+if test -z "$list_mounted_fs"; then
+AC_MSG_ERROR([could not determine how to read list of mounted filesystems])
+fi
 
 fi
 
 if test -z "$list_mounted_fs"; then
-  # DEC Alpha running OSF/1.
-  AC_MSG_CHECKING([for getfsstat function])
-  AC_CACHE_VAL(fu_cv_sys_mounted_getsstat,
-  [AC_TRY_LINK([
+# DEC Alpha running OSF/1.
+AC_MSG_CHECKING([for getfsstat function])
+AC_CACHE_VAL(fu_cv_sys_mounted_getsstat,
+[AC_TRY_LINK([
 #include <sys/types.h>
 #include <sys/mount.h>
 #include <sys/fs_types.h>],
-  [struct statfs *stats;
-  int numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); ],
-    fu_cv_sys_mounted_getsstat=yes,
-    fu_cv_sys_mounted_getsstat=no)])
-  AC_MSG_RESULT($fu_cv_sys_mounted_getsstat)
-  if test $fu_cv_sys_mounted_getsstat = yes; then
-    list_mounted_fs=found
-    AC_DEFINE(MOUNTED_GETFSSTAT)
-  fi
+[struct statfs *stats;
+int numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); ],
+fu_cv_sys_mounted_getsstat=yes,
+fu_cv_sys_mounted_getsstat=no)])
+AC_MSG_RESULT($fu_cv_sys_mounted_getsstat)
+if test $fu_cv_sys_mounted_getsstat = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_GETFSSTAT)
+fi
 fi
 
 if test -z "$list_mounted_fs"; then
-  # AIX.
-  AC_MSG_CHECKING([for mntctl function and struct vmount])
-  AC_CACHE_VAL(fu_cv_sys_mounted_vmount,
-  [AC_TRY_CPP([#include <fshelp.h>],
-    fu_cv_sys_mounted_vmount=yes,
-    fu_cv_sys_mounted_vmount=no)])
-  AC_MSG_RESULT($fu_cv_sys_mounted_vmount)
-  if test $fu_cv_sys_mounted_vmount = yes; then
-    list_mounted_fs=found
-    AC_DEFINE(MOUNTED_VMOUNT)
-  fi
+# AIX.
+AC_MSG_CHECKING([for mntctl function and struct vmount])
+AC_CACHE_VAL(fu_cv_sys_mounted_vmount,
+[AC_TRY_CPP([#include <fshelp.h>],
+fu_cv_sys_mounted_vmount=yes,
+fu_cv_sys_mounted_vmount=no)])
+AC_MSG_RESULT($fu_cv_sys_mounted_vmount)
+if test $fu_cv_sys_mounted_vmount = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_VMOUNT)
+fi
 fi
 
 if test -z "$list_mounted_fs"; then
-  # SVR3
-  AC_MSG_CHECKING([for FIXME existence of three headers])
-  AC_CACHE_VAL(fu_cv_sys_mounted_fread_fstyp,
-    [AC_TRY_CPP([
+# SVR3
+AC_MSG_CHECKING([for FIXME existence of three headers])
+AC_CACHE_VAL(fu_cv_sys_mounted_fread_fstyp,
+[AC_TRY_CPP([
 #include <sys/statfs.h>
 #include <sys/fstyp.h>
 #include <mnttab.h>],
-		fu_cv_sys_mounted_fread_fstyp=yes,
-		fu_cv_sys_mounted_fread_fstyp=no)])
-  AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp)
-  if test $fu_cv_sys_mounted_fread_fstyp = yes; then
-    list_mounted_fs=found
-    AC_DEFINE(MOUNTED_FREAD_FSTYP)
-  fi
+fu_cv_sys_mounted_fread_fstyp=yes,
+fu_cv_sys_mounted_fread_fstyp=no)])
+AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp)
+if test $fu_cv_sys_mounted_fread_fstyp = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_FREAD_FSTYP)
+fi
 fi
 
 if test -z "$list_mounted_fs"; then
-  # 4.4BSD and DEC OSF/1.
-  AC_MSG_CHECKING([for getmntinfo function])
-  AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo,
-    [
-      ok=
-      if test $ac_cv_func_getmntinfo = yes; then
-	AC_EGREP_HEADER(f_type;, sys/mount.h,
-			ok=yes)
-      fi
-      test -n "$ok" \
-	  && fu_cv_sys_mounted_getmntinfo=yes \
-	  || fu_cv_sys_mounted_getmntinfo=no
-    ])
-  AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo)
-  if test $fu_cv_sys_mounted_getmntinfo = yes; then
-    list_mounted_fs=found
-    AC_DEFINE(MOUNTED_GETMNTINFO)
-  fi
+# 4.4BSD and DEC OSF/1.
+AC_MSG_CHECKING([for getmntinfo function])
+AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo,
+[
+ok=
+if test $ac_cv_func_getmntinfo = yes; then
+AC_EGREP_HEADER(f_type;, sys/mount.h,
+ok=yes)
+fi
+test -n "$ok" \
+&& fu_cv_sys_mounted_getmntinfo=yes \
+|| fu_cv_sys_mounted_getmntinfo=no
+])
+AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo)
+if test $fu_cv_sys_mounted_getmntinfo = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_GETMNTINFO)
+fi
 fi
 
 # FIXME: add a test for netbsd-1.1 here
 
 if test -z "$list_mounted_fs"; then
-  # Ultrix
-  AC_MSG_CHECKING([for getmnt function])
-  AC_CACHE_VAL(fu_cv_sys_mounted_getmnt,
-    [AC_TRY_CPP([
+# Ultrix
+AC_MSG_CHECKING([for getmnt function])
+AC_CACHE_VAL(fu_cv_sys_mounted_getmnt,
+[AC_TRY_CPP([
 #include <sys/fs_types.h>
 #include <sys/mount.h>],
-		fu_cv_sys_mounted_getmnt=yes,
-		fu_cv_sys_mounted_getmnt=no)])
-  AC_MSG_RESULT($fu_cv_sys_mounted_getmnt)
-  if test $fu_cv_sys_mounted_getmnt = yes; then
-    list_mounted_fs=found
-    AC_DEFINE(MOUNTED_GETMNT)
-  fi
+fu_cv_sys_mounted_getmnt=yes,
+fu_cv_sys_mounted_getmnt=no)])
+AC_MSG_RESULT($fu_cv_sys_mounted_getmnt)
+if test $fu_cv_sys_mounted_getmnt = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_GETMNT)
+fi
 fi
 
 if test -z "$list_mounted_fs"; then
-  # SVR2
-  AC_MSG_CHECKING([whether it is possible to resort to fread on /etc/mnttab])
-  AC_CACHE_VAL(fu_cv_sys_mounted_fread,
-    [AC_TRY_CPP([#include <mnttab.h>],
-		fu_cv_sys_mounted_fread=yes,
-		fu_cv_sys_mounted_fread=no)])
-  AC_MSG_RESULT($fu_cv_sys_mounted_fread)
-  if test $fu_cv_sys_mounted_fread = yes; then
-    list_mounted_fs=found
-    AC_DEFINE(MOUNTED_FREAD)
-  fi
+# SVR2
+AC_MSG_CHECKING([whether it is possible to resort to fread on /etc/mnttab])
+AC_CACHE_VAL(fu_cv_sys_mounted_fread,
+[AC_TRY_CPP([#include <mnttab.h>],
+fu_cv_sys_mounted_fread=yes,
+fu_cv_sys_mounted_fread=no)])
+AC_MSG_RESULT($fu_cv_sys_mounted_fread)
+if test $fu_cv_sys_mounted_fread = yes; then
+list_mounted_fs=found
+AC_DEFINE(MOUNTED_FREAD)
+fi
 fi
 
 if test -z "$list_mounted_fs"; then
-  AC_MSG_ERROR([could not determine how to read list of mounted filesystems])
-  # FIXME -- no need to abort building the whole package
-  # Can't build mountlist.c or anything that needs its functions
+AC_MSG_ERROR([could not determine how to read list of mounted filesystems])
+# FIXME -- no need to abort building the whole package
+# Can't build mountlist.c or anything that needs its functions
 fi
 
 AC_CHECKING(how to get filesystem space usage)
@@ -348,49 +209,49 @@ space=no
 # systems.  That system is reported to work fine with STAT_STATFS4 which
 # is what it gets when this test fails.
 if test $space = no; then
-  # SVR4
-  AC_CACHE_CHECK([statvfs function (SVR4)], fu_cv_sys_stat_statvfs,
-		 [AC_TRY_LINK([#include <sys/types.h>
+# SVR4
+AC_CACHE_CHECK([statvfs function (SVR4)], fu_cv_sys_stat_statvfs,
+[AC_TRY_LINK([#include <sys/types.h>
 #include <sys/statvfs.h>],
-			      [struct statvfs fsd; statvfs (0, &fsd);],
-			      fu_cv_sys_stat_statvfs=yes,
-			      fu_cv_sys_stat_statvfs=no)])
-  if test $fu_cv_sys_stat_statvfs = yes; then
-    space=yes
-    AC_DEFINE(STAT_STATVFS)
-  fi
+[struct statvfs fsd; statvfs (0, &fsd);],
+fu_cv_sys_stat_statvfs=yes,
+fu_cv_sys_stat_statvfs=no)])
+if test $fu_cv_sys_stat_statvfs = yes; then
+space=yes
+AC_DEFINE(STAT_STATVFS)
+fi
 fi
 
 if test $space = no; then
-  # DEC Alpha running OSF/1
-  AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)])
-  AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1,
-  [AC_TRY_RUN([
+# DEC Alpha running OSF/1
+AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)])
+AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1,
+[AC_TRY_RUN([
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/mount.h>
-  main ()
-  {
-    struct statfs fsd;
-    fsd.f_fsize = 0;
-    exit (statfs (".", &fsd, sizeof (struct statfs)));
-  }],
-  fu_cv_sys_stat_statfs3_osf1=yes,
-  fu_cv_sys_stat_statfs3_osf1=no,
-  fu_cv_sys_stat_statfs3_osf1=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1)
-  if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
-    space=yes
-    AC_DEFINE(STAT_STATFS3_OSF1)
-  fi
+main ()
+{
+struct statfs fsd;
+fsd.f_fsize = 0;
+exit (statfs (".", &fsd, sizeof (struct statfs)));
+}],
+fu_cv_sys_stat_statfs3_osf1=yes,
+fu_cv_sys_stat_statfs3_osf1=no,
+fu_cv_sys_stat_statfs3_osf1=no)])
+AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1)
+if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
+space=yes
+AC_DEFINE(STAT_STATFS3_OSF1)
+fi
 fi
 
 if test $space = no; then
 # AIX
-  AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl
+AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl
 member (AIX, 4.3BSD)])
-  AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize,
-  [AC_TRY_RUN([
+AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize,
+[AC_TRY_RUN([
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
@@ -400,76 +261,76 @@ member (AIX, 4.3BSD)])
 #ifdef HAVE_SYS_VFS_H
 #include <sys/vfs.h>
 #endif
-  main ()
-  {
-  struct statfs fsd;
-  fsd.f_bsize = 0;
-  exit (statfs (".", &fsd));
-  }],
-  fu_cv_sys_stat_statfs2_bsize=yes,
-  fu_cv_sys_stat_statfs2_bsize=no,
-  fu_cv_sys_stat_statfs2_bsize=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize)
-  if test $fu_cv_sys_stat_statfs2_bsize = yes; then
-    space=yes
-    AC_DEFINE(STAT_STATFS2_BSIZE)
-  fi
+main ()
+{
+struct statfs fsd;
+fsd.f_bsize = 0;
+exit (statfs (".", &fsd));
+}],
+fu_cv_sys_stat_statfs2_bsize=yes,
+fu_cv_sys_stat_statfs2_bsize=no,
+fu_cv_sys_stat_statfs2_bsize=no)])
+AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize)
+if test $fu_cv_sys_stat_statfs2_bsize = yes; then
+space=yes
+AC_DEFINE(STAT_STATFS2_BSIZE)
+fi
 fi
 
 if test $space = no; then
 # SVR3
-  AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)])
-  AC_CACHE_VAL(fu_cv_sys_stat_statfs4,
-  [AC_TRY_RUN([#include <sys/types.h>
+AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)])
+AC_CACHE_VAL(fu_cv_sys_stat_statfs4,
+[AC_TRY_RUN([#include <sys/types.h>
 #include <sys/statfs.h>
-  main ()
-  {
-  struct statfs fsd;
-  exit (statfs (".", &fsd, sizeof fsd, 0));
-  }],
-    fu_cv_sys_stat_statfs4=yes,
-    fu_cv_sys_stat_statfs4=no,
-    fu_cv_sys_stat_statfs4=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_statfs4)
-  if test $fu_cv_sys_stat_statfs4 = yes; then
-    space=yes
-    AC_DEFINE(STAT_STATFS4)
-  fi
+main ()
+{
+struct statfs fsd;
+exit (statfs (".", &fsd, sizeof fsd, 0));
+}],
+fu_cv_sys_stat_statfs4=yes,
+fu_cv_sys_stat_statfs4=no,
+fu_cv_sys_stat_statfs4=no)])
+AC_MSG_RESULT($fu_cv_sys_stat_statfs4)
+if test $fu_cv_sys_stat_statfs4 = yes; then
+space=yes
+AC_DEFINE(STAT_STATFS4)
+fi
 fi
 
 if test $space = no; then
 # 4.4BSD and NetBSD
-  AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl
+AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl
 member (4.4BSD and NetBSD)])
-  AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize,
-  [AC_TRY_RUN([#include <sys/types.h>
+AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize,
+[AC_TRY_RUN([#include <sys/types.h>
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 #ifdef HAVE_SYS_MOUNT_H
 #include <sys/mount.h>
 #endif
-  main ()
-  {
-  struct statfs fsd;
-  fsd.f_fsize = 0;
-  exit (statfs (".", &fsd));
-  }],
-  fu_cv_sys_stat_statfs2_fsize=yes,
-  fu_cv_sys_stat_statfs2_fsize=no,
-  fu_cv_sys_stat_statfs2_fsize=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize)
-  if test $fu_cv_sys_stat_statfs2_fsize = yes; then
-    space=yes
-    AC_DEFINE(STAT_STATFS2_FSIZE)
-  fi
+main ()
+{
+struct statfs fsd;
+fsd.f_fsize = 0;
+exit (statfs (".", &fsd));
+}],
+fu_cv_sys_stat_statfs2_fsize=yes,
+fu_cv_sys_stat_statfs2_fsize=no,
+fu_cv_sys_stat_statfs2_fsize=no)])
+AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize)
+if test $fu_cv_sys_stat_statfs2_fsize = yes; then
+space=yes
+AC_DEFINE(STAT_STATFS2_FSIZE)
+fi
 fi
 
 if test $space = no; then
-  # Ultrix
-  AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)])
-  AC_CACHE_VAL(fu_cv_sys_stat_fs_data,
-  [AC_TRY_RUN([#include <sys/types.h>
+# Ultrix
+AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)])
+AC_CACHE_VAL(fu_cv_sys_stat_fs_data,
+[AC_TRY_RUN([#include <sys/types.h>
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
@@ -479,59 +340,59 @@ if test $space = no; then
 #ifdef HAVE_SYS_FS_TYPES_H
 #include <sys/fs_types.h>
 #endif
-  main ()
-  {
-  struct fs_data fsd;
-  /* Ultrix's statfs returns 1 for success,
-     0 for not mounted, -1 for failure.  */
-  exit (statfs (".", &fsd) != 1);
-  }],
-  fu_cv_sys_stat_fs_data=yes,
-  fu_cv_sys_stat_fs_data=no,
-  fu_cv_sys_stat_fs_data=no)])
-  AC_MSG_RESULT($fu_cv_sys_stat_fs_data)
-  if test $fu_cv_sys_stat_fs_data = yes; then
-    space=yes
-    AC_DEFINE(STAT_STATFS2_FS_DATA)
-  fi
+main ()
+{
+struct fs_data fsd;
+/* Ultrix's statfs returns 1 for success,
+0 for not mounted, -1 for failure.  */
+exit (statfs (".", &fsd) != 1);
+}],
+fu_cv_sys_stat_fs_data=yes,
+fu_cv_sys_stat_fs_data=no,
+fu_cv_sys_stat_fs_data=no)])
+AC_MSG_RESULT($fu_cv_sys_stat_fs_data)
+if test $fu_cv_sys_stat_fs_data = yes; then
+space=yes
+AC_DEFINE(STAT_STATFS2_FS_DATA)
+fi
 fi
 
 if test $space = no; then
 # SVR2
 AC_TRY_CPP([#include <sys/filsys.h>],
-  AC_DEFINE(STAT_READ_FILSYS) space=yes)
+AC_DEFINE(STAT_READ_FILSYS) space=yes)
 fi
 
 if test -n "$list_mounted_fs" && test $space != no; then
-  DF_PROG="df"
-  LIBOBJS="$LIBOBJS fsusage.o"
-  LIBOBJS="$LIBOBJS mountlist.o"
+DF_PROG="df"
+LIBOBJS="$LIBOBJS fsusage.o"
+LIBOBJS="$LIBOBJS mountlist.o"
 fi
 
 AC_CHECK_FUNCS(ftruncate, , [ftruncate_missing=yes])
 
 if test "$ftruncate_missing" = yes; then
-  AC_MSG_CHECKING([fcntl emulation of ftruncate])
-  AC_CACHE_VAL(fu_cv_sys_ftruncate_emulation,
-  [AC_TRY_LINK([
+AC_MSG_CHECKING([fcntl emulation of ftruncate])
+AC_CACHE_VAL(fu_cv_sys_ftruncate_emulation,
+[AC_TRY_LINK([
 #include <sys/types.h>
 #include <fcntl.h>], [
 #if !defined(F_CHSIZE) && !defined(F_FREESP)
 chsize();
 #endif
 ],
-    fu_cv_sys_ftruncate_emulation=yes,
-    fu_cv_sys_ftruncate_emulation=no)])
-  AC_MSG_RESULT($fu_cv_sys_ftruncate_emulation)
-  if test $fu_cv_sys_ftruncate_emulation = yes; then
-    LIBOBJS="$LIBOBJS ftruncate.o"
-  fi
+fu_cv_sys_ftruncate_emulation=yes,
+fu_cv_sys_ftruncate_emulation=no)])
+AC_MSG_RESULT($fu_cv_sys_ftruncate_emulation)
+if test $fu_cv_sys_ftruncate_emulation = yes; then
+LIBOBJS="$LIBOBJS ftruncate.o"
+fi
 fi
 
 case "$LIBOBJS" in
 *rename.o*)
-  MVDIR_PROG="mvdir"
-  ;;
+MVDIR_PROG="mvdir"
+;;
 esac
 
 # Check for SunOS statfs brokenness wrt partitions 2GB and larger.
@@ -550,25 +411,10 @@ fu_cv_sys_truncating_statfs=yes,
 fu_cv_sys_truncating_statfs=no,
 )])
 if test $fu_cv_sys_truncating_statfs = yes; then
-  AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS)
+AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS)
 fi
 AC_MSG_RESULT($fu_cv_sys_truncating_statfs)
 
-jm_FUNC_GETGROUPS
-test -n "$GETGROUPS_LIB" && LIBS="$GETGROUPS_LIB $LIBS"
-
-# Check for libypsec.a on Dolphin M88K machines.
-AC_CHECK_LIB(ypsec, main)
-
-# m88k running dgux 5.4 needs this
-AC_CHECK_LIB(ldgc, main)
-
 AC_CHECKING(for AFS)
 test -d /afs && AC_DEFINE(AFS)
-
-AM_GNU_GETTEXT
-AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
-
-AC_OUTPUT([Makefile doc/Makefile intl/Makefile lib/Makefile man/Makefile \
-m4/Makefile po/Makefile.in src/Makefile],
-[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
+])