X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fgetloadavg.m4;h=89d0125cf4f0adccce0a15a98a32134832b0280e;hb=9444b2cc75449834d4b397fe9ce99afaf7c16da8;hp=bb52d8ab1afef08739178a21947f7b15ffbb0bfe;hpb=409d8f2d902cc6e12e40b08200f5dac27d0e98cb;p=gnulib.git

diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4
index bb52d8ab1..89d0125cf 100644
--- a/m4/getloadavg.m4
+++ b/m4/getloadavg.m4
@@ -1,10 +1,13 @@
-#serial 2
+#serial 4
 
 AC_DEFUN(AM_FUNC_GETLOADAVG,
 [ac_have_func=no # yes means we've found a way to get the load average.
 
 am_cv_saved_LIBS="$LIBS"
 
+# On HPUX9, an unprivileged user can get load averages through this function.
+AC_CHECK_FUNCS(pstat_getdynamic)
+
 # Solaris has libkstat which does not require root.
 AC_CHECK_LIB(kstat, kstat_open)
 if test $ac_cv_lib_kstat_kstat_open = yes ; then ac_have_func=yes ; fi
@@ -34,32 +37,35 @@ fi
 AC_REPLACE_FUNCS(getloadavg)
 
 if test $ac_cv_func_getloadavg = yes; then
-  AC_DEFINE(HAVE_GETLOADAVG)
+  AC_DEFINE(HAVE_GETLOADAVG, 1, [FIXME])
   ac_have_func=yes
 else
-  AC_DEFINE(C_GETLOADAVG)
+  AC_DEFINE(C_GETLOADAVG, 1, [Define if using getloadavg.c.])
   # Figure out what our getloadavg.c needs.
   ac_have_func=no
   AC_CHECK_HEADER(sys/dg_sys_info.h,
-  [ac_have_func=yes; AC_DEFINE(DGUX)
+  [ac_have_func=yes; AC_DEFINE(DGUX, 1, [FIXME])
   AC_CHECK_LIB(dgc, dg_sys_info)])
 
+  AC_CHECK_HEADER(locale.h)
+  AC_CHECK_FUNCS(setlocale)
+
   # We cannot check for <dwarf.h>, because Solaris 2 does not use dwarf (it
   # uses stabs), but it is still SVR4.  We cannot check for <elf.h> because
   # Irix 4.0.5F has the header but not the library.
   if test $ac_have_func = no && test $ac_cv_lib_elf_elf_begin = yes; then
-    ac_have_func=yes; AC_DEFINE(SVR4)
+    ac_have_func=yes; AC_DEFINE(SVR4, 1, [FIXME])
   fi
 
   if test $ac_have_func = no; then
     AC_CHECK_HEADER(inq_stats/cpustats.h,
-    [ac_have_func=yes; AC_DEFINE(UMAX)
-    AC_DEFINE(UMAX4_3)])
+    [ac_have_func=yes; AC_DEFINE(UMAX, 1, [FIXME])
+    AC_DEFINE(UMAX4_3, 1, [FIXME])])
   fi
 
   if test $ac_have_func = no; then
     AC_CHECK_HEADER(sys/cpustats.h,
-    [ac_have_func=yes; AC_DEFINE(UMAX)])
+    [ac_have_func=yes; AC_DEFINE(UMAX, 1, [FIXME])])
   fi
 
   if test $ac_have_func = no; then
@@ -67,13 +73,13 @@ else
   fi
 
   AC_CHECK_HEADER(nlist.h,
-  [AC_DEFINE(NLIST_STRUCT)
+  [AC_DEFINE(NLIST_STRUCT, 1, [FIXME])
   AC_CACHE_CHECK([for n_un in struct nlist], ac_cv_struct_nlist_n_un,
   [AC_TRY_COMPILE([#include <nlist.h>],
   [struct nlist n; n.n_un.n_name = 0;],
   ac_cv_struct_nlist_n_un=yes, ac_cv_struct_nlist_n_un=no)])
   if test $ac_cv_struct_nlist_n_un = yes; then
-    AC_DEFINE(NLIST_NAME_UNION)
+    AC_DEFINE(NLIST_NAME_UNION, 1, [FIXME])
   fi
   ])dnl
 fi # Do not have getloadavg in system libraries.
@@ -89,7 +95,7 @@ Yowza Am I SETGID yet
 #endif],
   ac_cv_func_getloadavg_setgid=yes, ac_cv_func_getloadavg_setgid=no)])
 if test $ac_cv_func_getloadavg_setgid = yes; then
-  NEED_SETGID=true; AC_DEFINE(GETLOADAVG_PRIVILEGED)
+  NEED_SETGID=true; AC_DEFINE(GETLOADAVG_PRIVILEGED, 1, [FIXME])
 else
   NEED_SETGID=false
 fi