X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fphysmem.m4;h=6058f48e154e68b76d5a1255edc6ddf9b1ea1bcd;hb=c1dcfef8c8e60b139732f79bd8a9787e5d6a805f;hp=824db10fa85d6e80bba9e4de1a14cac5ad55d2f6;hpb=6e02d3017f4ca12b7fdb9a37597377f5a71dd1ca;p=gnulib.git

diff --git a/m4/physmem.m4 b/m4/physmem.m4
index 824db10fa..6058f48e1 100644
--- a/m4/physmem.m4
+++ b/m4/physmem.m4
@@ -1,27 +1,27 @@
-# physmem.m4 serial 2
-dnl Copyright (C) 2002, 2003 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
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# physmem.m4 serial 11
+dnl Copyright (C) 2002-2003, 2005-2006, 2008-2011 Free Software Foundation,
+dnl 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.
 
 # 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,
-		  gl_cv_var__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>
-		      ]],
-		      [double x = _system_configuration.physmem;])],
+                      [[#include <sys/systemcfg.h>
+                      ]],
+                      [[double x = _system_configuration.physmem;
+                        if (x > 0.0) return 0;]])],
       [gl_cv_var__system_configuration=yes],
       [gl_cv_var__system_configuration=no])])
 
     if test $gl_cv_var__system_configuration = yes; then
-      AC_DEFINE(HAVE__SYSTEM_CONFIGURATION, 1,
-		[Define to 1 if you have the external variable,
-		_system_configuration with a member named physmem.])
+      AC_DEFINE([HAVE__SYSTEM_CONFIGURATION], [1],
+                [Define to 1 if you have the external variable,
+                _system_configuration with a member named physmem.])
     fi
   ]
 )
@@ -29,11 +29,17 @@ AC_DEFUN([gl_SYS__SYSTEM_CONFIGURATION],
 AC_DEFUN([gl_PHYSMEM],
 [
   # Prerequisites of lib/physmem.c.
-  AC_CHECK_HEADERS_ONCE(unistd.h)
   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])
 ])