Fix recognition of sys/sysctl.h on OpenBSD 4.0.

[pspp] / m4 / physmem.m4

diff --git a/m4/physmem.m4 b/m4/physmem.m4
index b5001e1fc918fa5f56631e87bb1fd0ae6a1b8ce0..9f93fa9bfc7991259711a49dcec6664c3d697357 100644 (file)
--- a/m4/physmem.m4
+++ b/m4/physmem.m4
@@ -1,5 +1,5 @@
-# physmem.m4 serial 8
-dnl Copyright (C) 2002-2003, 2005-2006, 2008 Free Software Foundation, Inc.
+# 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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved.
 # Check for the external symbol, _system_configuration,
 # a struct with member `physmem'.
 AC_DEFUN([gl_SYS__SYSTEM_CONFIGURATION],
-  [AC_CACHE_CHECK(for external symbol _system_configuration,
+  [AC_CACHE_CHECK([for external symbol _system_configuration],
                  gl_cv_var__system_configuration,
     [AC_LINK_IFELSE([AC_LANG_PROGRAM(
                      [[#include <sys/systemcfg.h>
@@ -18,7 +18,7 @@ AC_DEFUN([gl_SYS__SYSTEM_CONFIGURATION],
       [gl_cv_var__system_configuration=no])])
 
     if test $gl_cv_var__system_configuration = yes; then
-      AC_DEFINE(HAVE__SYSTEM_CONFIGURATION, 1,
+      AC_DEFINE([HAVE__SYSTEM_CONFIGURATION], [1],
                [Define to 1 if you have the external variable,
                _system_configuration with a member named physmem.])
     fi
@@ -31,9 +31,16 @@ AC_DEFUN([gl_PHYSMEM],
 
   # 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_CHECK_FUNCS([pstat_getstatic pstat_getdynamic sysmp getsysinfo sysctl table])
   AC_REQUIRE([gl_SYS__SYSTEM_CONFIGURATION])
 ])