aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macros/ChangeLog9
-rw-r--r--macros/Makefile.am3
-rw-r--r--macros/gnome-fileutils.m429
3 files changed, 13 insertions, 28 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index 2e625f306a..ef0fbb34f4 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,12 @@
+1998-06-24 Raja R Harinath <harinath@cs.umn.edu>
+
+ * gnome-fileutils.m4 (AM_FUNC_ERROR_AT_LINE): New check.
+ (vprintf): New check.
+ (ftruncate.c): Remove check.
+ This needs to be further cleaned up to only list what is
+ needed for gdiskfree.
+ * Makefile.am (MACROS): Add gnome-fileutils.m4.
+
1998-06-14 Martin Baulig <martin@home-of-linux.org>
* gnome-libgtop-sysdeps.m4 (LINUX_TABLE): New automake conditional;
diff --git a/macros/Makefile.am b/macros/Makefile.am
index 0ea65e484e..10e5585ab9 100644
--- a/macros/Makefile.am
+++ b/macros/Makefile.am
@@ -1,7 +1,8 @@
## Please update this variable if any new macros are created
MACROS= aclocal-include.m4 gnome-guile-checks.m4 \
gnome-objc-checks.m4 gnome-x-checks.m4 \
- gnome-support.m4 gnome-pthread-check.m4 gnome.m4
+ gnome-support.m4 gnome-pthread-check.m4 gnome.m4 \
+ gnome-fileutils.m4
EXTRA_DIST=$(MACROS) autogen.sh macros.dep
MAINTAINERCLEANFILES=macros.dep
diff --git a/macros/gnome-fileutils.m4 b/macros/gnome-fileutils.m4
index df69d34fa0..249f8dfcd2 100644
--- a/macros/gnome-fileutils.m4
+++ b/macros/gnome-fileutils.m4
@@ -10,9 +10,10 @@ 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)
+AM_FUNC_ERROR_AT_LINE
AC_CHECK_FUNCS(bcopy endgrent endpwent fchdir ftime ftruncate \
getcwd getmntinfo gettimeofday isascii lchown \
-listmntent memcpy mkfifo strchr strerror strrchr)
+listmntent memcpy mkfifo strchr strerror strrchr vprintf)
# Determine how to get the list of mounted filesystems.
list_mounted_fs=
@@ -369,32 +370,6 @@ 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([
-#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
-fi
-
-case "$LIBOBJS" in
-*rename.o*)
-MVDIR_PROG="mvdir"
-;;
-esac
-
# Check for SunOS statfs brokenness wrt partitions 2GB and larger.
# If <sys/vfs.h> exists and struct statfs has a member named f_spare,
# enable the work-around code in fsusage.c.