# HG changeset patch # User Paul Eggert # Date 1157140475 0 # Node ID edd0f5855283b544c67dd2947fa3ae283a8509f2 # Parent c77c9dc7d8c6c34dd9ca98632e9d83d81da8541f * lib/getloadavg.c: Use CONFIGURING_GETLOADAVG, not gl_GETLOADAVG. Problem reported by Ralf Wildenhues in . * m4/getloadavg.m4 (gl_GETLOADAVG): Use CONFIGURING_GETLOADAVG, not gl_GETLOADAVG. Omit unneeded semicolons. Problems reported by Ralf Wildenhues in . (gl_PREREQ_GETLOADAVG): Use AC_DEFUN, not m4_define. Put at the end, which is the usual gnulib style. diff --git a/lib/ChangeLog b/lib/ChangeLog --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,5 +1,9 @@ 2006-09-01 Paul Eggert + * getloadavg.c: Use CONFIGURING_GETLOADAVG, not gl_GETLOADAVG. + Problem reported by Ralf Wildenhues in + . + * mountlist.c: All uses of HAVE_F_FSTYPENAME_IN_STATFS replaced by HAVE_STRUCT_STATFS_F_FSTYPENAME. diff --git a/lib/getloadavg.c b/lib/getloadavg.c --- a/lib/getloadavg.c +++ b/lib/getloadavg.c @@ -81,16 +81,16 @@ We also #define LDAV_PRIVILEGED if a program will require special installation to be able to call getloadavg. */ -/* "configure" defines gl_GETLOADAVG to sidestep problems with - partially-configured source directories. */ +/* "configure" defines CONFIGURING_GETLOADAVG to sidestep problems + with partially-configured source directories. */ #ifdef HAVE_CONFIG_H -# ifndef gl_GETLOADAVG +# ifndef CONFIGURING_GETLOADAVG # include # endif #endif -#ifndef gl_GETLOADAVG +#ifndef CONFIGURING_GETLOADAVG # include #endif diff --git a/m4/ChangeLog b/m4/ChangeLog --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,5 +1,12 @@ 2006-09-01 Paul Eggert + * getloadavg.m4 (gl_GETLOADAVG): Use CONFIGURING_GETLOADAVG, + not gl_GETLOADAVG. Omit unneeded semicolons. + Problems reported by Ralf Wildenhues in + . + (gl_PREREQ_GETLOADAVG): Use AC_DEFUN, not m4_define. Put + at the end, which is the usual gnulib style. + * fstypename.m4 (gl_FSTYPENAME): Use AC_CHECK_MEMBERS instead of doing all the work ourselves. * fsusage.m4 (gl_PREREQ_FSUSAGE_EXTRA): Don't check for diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 --- a/m4/getloadavg.m4 +++ b/m4/getloadavg.m4 @@ -10,59 +10,8 @@ # Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent. # New applications should use gl_GETLOADAVG instead. -# gl_PREREQ_GETLOADAVG -# -------------------- -# Set up the AC_LIBOBJ replacement of `getloadavg'. -m4_define([gl_PREREQ_GETLOADAVG], -[AC_LIBOBJ(getloadavg) -AC_DEFINE(C_GETLOADAVG, 1, [Define to 1 if using `getloadavg.c'.]) -# Figure out what our getloadavg.c needs. -gl_have_func=no -AC_CHECK_HEADER(sys/dg_sys_info.h, -[gl_have_func=yes - AC_DEFINE(DGUX, 1, [Define to 1 for DGUX with .]) - AC_CHECK_LIB(dgc, dg_sys_info)]) - -# We cannot check for , because Solaris 2 does not use dwarf (it -# uses stabs), but it is still SVR4. We cannot check for because -# Irix 4.0.5F has the header but not the library. -if test $gl_have_func = no && test "$ac_cv_lib_elf_elf_begin" = yes; then - gl_have_func=yes - AC_DEFINE(SVR4, 1, [Define to 1 on System V Release 4.]) -fi - -if test $gl_have_func = no; then - AC_CHECK_HEADER(inq_stats/cpustats.h, - [gl_have_func=yes - AC_DEFINE(UMAX, 1, [Define to 1 for Encore UMAX.]) - AC_DEFINE(UMAX4_3, 1, - [Define to 1 for Encore UMAX 4.3 that has - instead of .])]) -fi - -if test $gl_have_func = no; then - AC_CHECK_HEADER(sys/cpustats.h, - [gl_have_func=yes; AC_DEFINE(UMAX)]) -fi - -if test $gl_have_func = no; then - AC_CHECK_HEADERS(mach/mach.h) -fi - -AC_CHECK_HEADERS(nlist.h, -[AC_CHECK_MEMBERS([struct nlist.n_un.n_name], - [AC_DEFINE(NLIST_NAME_UNION, 1, - [Define to 1 if your `struct nlist' has an - `n_un' member. Obsolete, depend on - `HAVE_STRUCT_NLIST_N_UN_N_NAME])], [], - [@%:@include ]) -])dnl -])# gl_PREREQ_GETLOADAVG - - # gl_GETLOADAVG # ------------- -AN_FUNCTION([getloadavg], [gl_GETLOADAVG]) AC_DEFUN([gl_GETLOADAVG], [gl_have_func=no # yes means we've found a way to get the load average. @@ -114,7 +63,7 @@ AC_CACHE_CHECK(whether getloadavg requires setgid, gl_cv_func_getloadavg_setgid, [AC_EGREP_CPP([Yowza Am I SETGID yet], -[#define gl_GETLOADAVG +[#define CONFIGURING_GETLOADAVG #include "$srcdir/$ac_config_libobj_dir/getloadavg.c" #ifdef LDAV_PRIVILEGED Yowza Am I SETGID yet @@ -139,9 +88,9 @@ # If we got an error (system does not support symlinks), try without -L. test -z "$ac_ls_output" && ac_ls_output=`ls -lg /dev/kmem` gl_cv_group_kmem=`echo $ac_ls_output \ - | sed -ne ['s/[ ][ ]*/ /g; - s/^.[sSrwx-]* *[0-9]* *\([^0-9]*\) *.*/\1/; - / /s/.* //;p;']` + | sed -ne ['s/[ ][ ]*/ /g + s/^.[sSrwx-]* *[0-9]* *\([^0-9]*\) *.*/\1/ + / /s/.* //;p']` ]) AC_SUBST(KMEM_GROUP, $gl_cv_group_kmem)dnl fi @@ -154,3 +103,53 @@ AC_SUBST(GETLOADAVG_LIBS)dnl ])# gl_GETLOADAVG + + +# gl_PREREQ_GETLOADAVG +# -------------------- +# Set up the AC_LIBOBJ replacement of `getloadavg'. +AC_DEFUN([gl_PREREQ_GETLOADAVG], +[AC_LIBOBJ(getloadavg) +AC_DEFINE(C_GETLOADAVG, 1, [Define to 1 if using `getloadavg.c'.]) +# Figure out what our getloadavg.c needs. +gl_have_func=no +AC_CHECK_HEADER(sys/dg_sys_info.h, +[gl_have_func=yes + AC_DEFINE(DGUX, 1, [Define to 1 for DGUX with .]) + AC_CHECK_LIB(dgc, dg_sys_info)]) + +# We cannot check for , because Solaris 2 does not use dwarf (it +# uses stabs), but it is still SVR4. We cannot check for because +# Irix 4.0.5F has the header but not the library. +if test $gl_have_func = no && test "$ac_cv_lib_elf_elf_begin" = yes; then + gl_have_func=yes + AC_DEFINE(SVR4, 1, [Define to 1 on System V Release 4.]) +fi + +if test $gl_have_func = no; then + AC_CHECK_HEADER(inq_stats/cpustats.h, + [gl_have_func=yes + AC_DEFINE(UMAX, 1, [Define to 1 for Encore UMAX.]) + AC_DEFINE(UMAX4_3, 1, + [Define to 1 for Encore UMAX 4.3 that has + instead of .])]) +fi + +if test $gl_have_func = no; then + AC_CHECK_HEADER(sys/cpustats.h, + [gl_have_func=yes; AC_DEFINE(UMAX)]) +fi + +if test $gl_have_func = no; then + AC_CHECK_HEADERS(mach/mach.h) +fi + +AC_CHECK_HEADERS(nlist.h, +[AC_CHECK_MEMBERS([struct nlist.n_un.n_name], + [AC_DEFINE(NLIST_NAME_UNION, 1, + [Define to 1 if your `struct nlist' has an + `n_un' member. Obsolete, depend on + `HAVE_STRUCT_NLIST_N_UN_N_NAME])], [], + [@%:@include ]) +])dnl +])# gl_PREREQ_GETLOADAVG