X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fftruncate.m4;h=4f2dafbab4c6939ba4cbd905a3d0aa1a2ed3c415;hb=23eecb48e39afd0d267d64d40ba6bf97aa865e13;hp=b7f346a4ab75edfcb4ae4a8668ccd2d148e0f781;hpb=dbde79f142ffc8247f4ffe20d19d7677b8fb0497;p=gnulib.git

diff --git a/m4/ftruncate.m4 b/m4/ftruncate.m4
index b7f346a4a..4f2dafbab 100644
--- a/m4/ftruncate.m4
+++ b/m4/ftruncate.m4
@@ -1,46 +1,40 @@
-#serial 13
+# serial 20
 
-# See if we need to emulate a missing ftruncate function using fcntl or chsize.
+# See if we need to emulate a missing ftruncate function using chsize.
 
-# Copyright (C) 2000, 2001, 2003-2007 Free Software Foundation, Inc.
+# Copyright (C) 2000-2001, 2003-2007, 2009-2013 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# FIXME: remove this macro, along with all uses of HAVE_FTRUNCATE in 2010,
-# if the check below provokes no more reports.  So far, the only report
-# arose from a test build of this gnulib module, cross-compiling to mingw:
-# <http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/9203>
-
 AC_DEFUN([gl_FUNC_FTRUNCATE],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  AC_REQUIRE([AC_CANONICAL_HOST])
   AC_CHECK_FUNCS_ONCE([ftruncate])
-  if test $ac_cv_func_ftruncate = no; then
+  if test $ac_cv_func_ftruncate = yes; then
+    m4_ifdef([gl_LARGEFILE], [
+      AC_REQUIRE([AC_CANONICAL_HOST])
+      case "$host_os" in
+        mingw*)
+          dnl Native Windows, and Large File Support is requested.
+          dnl The MSVCRT _chsize() function only accepts a 32-bit file size,
+          dnl and the mingw64 ftruncate64() function is unreliable (it may
+          dnl delete the file, see
+          dnl <http://mingw-w64.sourcearchive.com/documentation/2.0-1/ftruncate64_8c_source.html>).
+          dnl Use gnulib's ftruncate() implementation instead.
+          REPLACE_FTRUNCATE=1
+          ;;
+      esac
+    ], [
+      :
+    ])
+  else
     HAVE_FTRUNCATE=0
-    AC_LIBOBJ([ftruncate])
-    gl_PREREQ_FTRUNCATE
-    case "$host_os" in
-      mingw*)
-        # Yes, we know mingw lacks ftruncate.
-        ;;
-      *)
-        # If someone lacks ftruncate, make configure fail, and request
-        # a bug report to inform us about it.
-        if test x"$SKIP_FTRUNCATE_CHECK" != xyes; then
-          AC_MSG_FAILURE([Your system lacks the ftruncate function.
-	      Please report this, along with the output of "uname -a", to the
-	      bug-coreutils@gnu.org mailing list.  To continue past this point,
-	      rerun configure with SKIP_FTRUNCATE_CHECK=yes.
-	      E.g., ./configure SKIP_FTRUNCATE_CHECK=yes])
-        fi
-    esac
   fi
 ])
 
 # Prerequisites of lib/ftruncate.c.
 AC_DEFUN([gl_PREREQ_FTRUNCATE],
 [
-  AC_CHECK_FUNCS(chsize)
+  AC_CHECK_FUNCS([chsize])
 ])