X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fphysmem.m4;h=456bb3711f39c44e3ece129e3489823d492212be;hb=606dd130bdce412935eca78598923720a7e346c4;hp=824db10fa85d6e80bba9e4de1a14cac5ad55d2f6;hpb=6e02d3017f4ca12b7fdb9a37597377f5a71dd1ca;p=gnulib.git

diff --git a/m4/physmem.m4 b/m4/physmem.m4
index 824db10fa..456bb3711 100644
--- a/m4/physmem.m4
+++ b/m4/physmem.m4
@@ -1,10 +1,8 @@
-# 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 7
+dnl Copyright (C) 2002, 2003, 2005, 2006 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.
 
 # Check for the external symbol, _system_configuration,
 # a struct with member `physmem'.
@@ -14,7 +12,8 @@ AC_DEFUN([gl_SYS__SYSTEM_CONFIGURATION],
     [AC_LINK_IFELSE([AC_LANG_PROGRAM(
 		      [[#include <sys/systemcfg.h>
 		      ]],
-		      [double x = _system_configuration.physmem;])],
+		      [double x = _system_configuration.physmem;
+		       if (x > 0.0) return 0;])],
       [gl_cv_var__system_configuration=yes],
       [gl_cv_var__system_configuration=no])])
 
@@ -28,8 +27,9 @@ AC_DEFUN([gl_SYS__SYSTEM_CONFIGURATION],
 
 AC_DEFUN([gl_PHYSMEM],
 [
+  AC_LIBOBJ([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])