Merge branch 'upstream' into dfsg-orig

[tar] / m4 / getpagesize.m4

diff --git a/m4/getpagesize.m4 b/m4/getpagesize.m4
index 8968516e2c7f462e4ed028cd286193d46304bb82..313ad7fa26c4bc3f28179c06ce16095ca8d11ba3 100644 (file)
--- a/m4/getpagesize.m4
+++ b/m4/getpagesize.m4
@@ -1,4 +1,4 @@
-# getpagesize.m4 serial 7
+# getpagesize.m4 serial 8
 dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2010 Free Software Foundation,
 dnl Inc.
 dnl This file is free software; the Free Software Foundation
@@ -27,4 +27,7 @@ AC_DEFUN([gl_FUNC_GETPAGESIZE],
       AC_LIBOBJ([getpagesize])
       ;;
   esac
+  dnl Also check whether it's declared.
+  dnl mingw has getpagesize() in libgcc.a but doesn't declare it.
+  AC_CHECK_DECL([getpagesize], , [HAVE_DECL_GETPAGESIZE=0])
 ])