From 1182d8066e62f5338c92bbc203ef53c1d1025e80 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 22 May 2011 17:13:04 +0200 Subject: [PATCH] uname: Move AC_LIBOBJ invocations to module description. * m4/uname.m4 (gl_FUNC_UNAME): Call AC_CHECK_FUNCS instead of AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_UNAME invocations from here... * modules/uname (configure.ac): ... to here. --- ChangeLog | 8 ++++++++ m4/uname.m4 | 5 ++--- modules/uname | 4 ++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84009ea71..e395bb53f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2011-05-22 Bruno Haible + uname: Move AC_LIBOBJ invocations to module description. + * m4/uname.m4 (gl_FUNC_UNAME): Call AC_CHECK_FUNCS instead of + AC_REPLACE_FUNCS. Move AC_LIBOBJ and gl_PREREQ_UNAME invocations from + here... + * modules/uname (configure.ac): ... to here. + +2011-05-22 Bruno Haible + ttyname_r: Move AC_LIBOBJ invocations to module description. * m4/ttyname_r.m4 (gl_FUNC_TTYNAME_R): Move AC_LIBOBJ and gl_PREREQ_TTYNAME_R invocations from here... diff --git a/m4/uname.m4 b/m4/uname.m4 index 71bb3a1d9..b4f964eb2 100644 --- a/m4/uname.m4 +++ b/m4/uname.m4 @@ -1,4 +1,4 @@ -# uname.m4 serial 10 +# uname.m4 serial 11 dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -7,10 +7,9 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_UNAME], [ AC_REQUIRE([gl_SYS_UTSNAME_H_DEFAULTS]) - AC_REPLACE_FUNCS([uname]) + AC_CHECK_FUNCS([uname]) if test $ac_cv_func_uname = no; then HAVE_UNAME=0 - gl_PREREQ_UNAME fi ]) diff --git a/modules/uname b/modules/uname index e7364ad3c..70271e4d0 100644 --- a/modules/uname +++ b/modules/uname @@ -11,6 +11,10 @@ gethostname [test $HAVE_UNAME = 0] configure.ac: gl_FUNC_UNAME +if test $HAVE_UNAME = 0; then + AC_LIBOBJ([uname]) + gl_PREREQ_UNAME +fi gl_SYS_UTSNAME_MODULE_INDICATOR([uname]) Makefile.am: -- 2.11.0