Imported Upstream version 3.2.0

[debian/amanda] / config / gnulib / physmem.m4

diff --git a/config/gnulib/physmem.m4 b/config/gnulib/physmem.m4
index 2d79a699723cfbac3b029b203fb7dff92338fa91..042a335756f4e85c69c89b826625872566e6fcca 100644 (file)
--- a/config/gnulib/physmem.m4
+++ b/config/gnulib/physmem.m4
@@ -1,5 +1,6 @@
-# physmem.m4 serial 9
-dnl Copyright (C) 2002-2003, 2005-2006, 2008-2009 Free Software Foundation, Inc.
+# physmem.m4 serial 10
+dnl Copyright (C) 2002-2003, 2005-2006, 2008-2010 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.
@@ -8,19 +9,19 @@ dnl with or without modifications, as long as this notice is preserved.
 # a struct with member `physmem'.
 AC_DEFUN([gl_SYS__SYSTEM_CONFIGURATION],
   [AC_CACHE_CHECK([for external symbol _system_configuration],
-                 gl_cv_var__system_configuration,
+                  gl_cv_var__system_configuration,
     [AC_LINK_IFELSE([AC_LANG_PROGRAM(
-                     [[#include <sys/systemcfg.h>
-                     ]],
-                     [[double x = _system_configuration.physmem;
-                       if (x > 0.0) return 0;]])],
+                      [[#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.])
+                [Define to 1 if you have the external variable,
+                _system_configuration with a member named physmem.])
     fi
   ]
 )
@@ -31,8 +32,15 @@ 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_REQUIRE([gl_SYS__SYSTEM_CONFIGURATION])