Mercurial > hg > octave-lojdl > gnulib-hg

changeset 12175:45b975b8ea71

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix recognition of sys/sysctl.h on OpenBSD 4.0.
author Bruno Haible <bruno@clisp.org>
date Sun, 18 Oct 2009 10:00:29 +0200
parents 73f2681e0524
children 4c3269eff85a
files ChangeLog m4/physmem.m4
diffstat 2 files changed, 16 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-18  Bruno Haible  <bruno@clisp.org>
+
+	Fix recognition of sys/sysctl.h on OpenBSD 4.0.
+	* m4/physmem.m4 (gl_PHYSMEM): Before including sys/sysctl.h, include
+	sys/param.h.
+
 2009-10-16  Eric Blake  <ebb9@byu.net>
 
 	utimensat: new module
--- a/m4/physmem.m4
+++ b/m4/physmem.m4
@@ -1,4 +1,4 @@
-# physmem.m4 serial 9
+# physmem.m4 serial 10
 dnl Copyright (C) 2002-2003, 2005-2006, 2008-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -31,8 +31,15 @@
 
   # Prerequisites of lib/physmem.c.
   AC_CHECK_HEADERS([sys/pstat.h sys/sysmp.h sys/sysinfo.h \
-    machine/hal_sysinfo.h sys/table.h sys/param.h sys/sysctl.h \
-    sys/systemcfg.h],,, [AC_INCLUDES_DEFAULT])
+    machine/hal_sysinfo.h sys/table.h sys/param.h sys/systemcfg.h],,,
+    [AC_INCLUDES_DEFAULT])
+  dnl <sys/sysctl.h> requires <sys/param.h> on OpenBSD 4.0.
+  AC_CHECK_HEADERS([sys/sysctl.h],,,
+    [AC_INCLUDES_DEFAULT
+     #if HAVE_SYS_PARAM_H
+     # include <sys/param.h>
+     #endif
+    ])
 
   AC_CHECK_FUNCS([pstat_getstatic pstat_getdynamic sysmp getsysinfo sysctl table])
   AC_REQUIRE([gl_SYS__SYSTEM_CONFIGURATION])