From 4dc4f1e228af045c09a926cc7b86e2cccdb4954a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 8 May 2011 12:14:03 +0200 Subject: [PATCH] getloadavg: Move AC_LIBOBJ invocations to module description. * m4/getloadavg.m4 (gl_FUNC_GETDELIM): Set HAVE_GETLOADAVG. Move AC_LIBOBJ and gl_PREREQ_GETLOADAVG invocations from here... * modules/getloadavg (configure.ac): ... to here. --- ChangeLog | 7 +++++++ m4/getloadavg.m4 | 6 +++--- modules/getloadavg | 4 ++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index c1bb81553..cda562164 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-05-08 Bruno Haible + getloadavg: Move AC_LIBOBJ invocations to module description. + * m4/getloadavg.m4 (gl_FUNC_GETDELIM): Set HAVE_GETLOADAVG. Move + AC_LIBOBJ and gl_PREREQ_GETLOADAVG invocations from here... + * modules/getloadavg (configure.ac): ... to here. + +2011-05-08 Bruno Haible + gethrxtime: Move AC_LIBOBJ invocations to module description. * m4/gethrxtime.m4 (gl_PREREQ_GETHRXTIME): Move code that determines LIB_GETHRXTIME from here... diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 index 0e44b694e..967dfd797 100644 --- a/m4/getloadavg.m4 +++ b/m4/getloadavg.m4 @@ -7,7 +7,7 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 3 +#serial 4 # Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent. # New applications should use gl_GETLOADAVG instead. @@ -24,6 +24,7 @@ gl_save_LIBS=$LIBS # getloadvg is present in libc on glibc >= 2.2, MacOS X, FreeBSD >= 2.0, # NetBSD >= 0.9, OpenBSD >= 2.0, Solaris >= 7. +HAVE_GETLOADAVG=1 AC_CHECK_FUNC([getloadavg], [], [gl_have_func=no @@ -52,8 +53,7 @@ AC_CHECK_FUNC([getloadavg], [], # Set up the replacement function if necessary. if test $gl_have_func = no; then - AC_LIBOBJ([getloadavg]) - gl_PREREQ_GETLOADAVG + HAVE_GETLOADAVG=0 fi]) if test "x$gl_save_LIBS" = x; then diff --git a/modules/getloadavg b/modules/getloadavg index c17281c7c..1b0f581be 100644 --- a/modules/getloadavg +++ b/modules/getloadavg @@ -13,6 +13,10 @@ stdlib configure.ac: gl_GETLOADAVG +if test $HAVE_GETLOADAVG = 0; then + AC_LIBOBJ([getloadavg]) + gl_PREREQ_GETLOADAVG +fi gl_STDLIB_MODULE_INDICATOR([getloadavg]) Makefile.am: -- 2.11.0