getpagesize module shouldn't assume sys/param.h exists.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index ab2d9382886c12c6f31b92bb06ddeb2f2acc1a80..ea8139e4b7eca61424e468560549d7f63687cdd4 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,9 @@
 2004-10-22  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * getpagesize.c (getpagesize): Don't assume <sys/param.h> exists.
+       It's now the caller's responsibility to handle the case where
+       !HAVE_GETPAGESIZE && !defined getpagesize.
+
        * mktime.c (leapyear): Arg is long int, not int.
 
 2004-10-18  Paul Eggert  <eggert@cs.ucla.edu>

diff --git a/lib/getpagesize.h b/lib/getpagesize.h
index 80d9eb3becbf9b4cf4496c7b029fac90d0512823..e63c1c708c9505d766d19b0f992e89d3a0f3545c 100644 (file)
--- a/lib/getpagesize.h
+++ b/lib/getpagesize.h
@@ -1,5 +1,5 @@
 /* Emulate getpagesize on systems that lack it.
-   Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2004 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,7 +44,7 @@
 # endif
 #endif
 
-#ifndef getpagesize
+#if !defined getpagesize && HAVE_SYS_PARAM_H
 # include <sys/param.h>
 # ifdef EXEC_PAGESIZE
 #  define getpagesize() EXEC_PAGESIZE

diff --git a/m4/ChangeLog b/m4/ChangeLog
index c7bef8b0168a0af1548a1a7bee836d2b7b894a36..99ec992d155d1b9a4aeba73a8cc0da81b96ecf1d 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * getpagesize.m4 (gl_GETPAGESIZE): Check for <sys/param.h>.
+
 2004-10-15  Paul Eggert  <eggert@cs.ucla.edu>
 
        * getopt.m4 (gl_GETOPT): Detect and reject the incompatible BSD

diff --git a/m4/getpagesize.m4 b/m4/getpagesize.m4
index f1f4c42d47f78804729b83d30b050ff1f9e4a142..a2f818b62ba721623b9daebca6454fc36a2b55d7 100644 (file)
--- a/m4/getpagesize.m4
+++ b/m4/getpagesize.m4
@@ -1,5 +1,5 @@
-# getpagesize.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# getpagesize.m4 serial 2
+dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -9,7 +9,7 @@ dnl the same distribution terms as the rest of that program.
 AC_DEFUN([gl_GETPAGESIZE],
 [
   dnl Prerequisites of lib/getpagesize.h.
-  AC_CHECK_HEADERS_ONCE(unistd.h)
+  AC_CHECK_HEADERS_ONCE(sys/param.h unistd.h)
   AC_CHECK_HEADERS(OS.h)
   AC_CHECK_FUNCS(getpagesize)
 ])