From 752f38f3ea77b7f20360bc3d5912eb22e288faed Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 21 May 2011 16:58:50 +0200 Subject: [PATCH] poll: Move AC_LIBOBJ invocations to module description. * m4/poll.m4 (gl_FUNC_POLL): Move AC_LIBOBJ and gl_PREREQ_POLL invocations from here... * modules/poll (configure.ac): ... to here. --- ChangeLog | 7 +++++++ m4/poll.m4 | 5 ++--- modules/poll | 4 ++++ 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f2cd4ef83..9f4d73ca8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-05-21 Bruno Haible + poll: Move AC_LIBOBJ invocations to module description. + * m4/poll.m4 (gl_FUNC_POLL): Move AC_LIBOBJ and gl_PREREQ_POLL + invocations from here... + * modules/poll (configure.ac): ... to here. + +2011-05-21 Bruno Haible + pipe-posix: Move AC_LIBOBJ invocations to module description. * m4/pipe.m4 (gl_FUNC_PIPE): Move AC_LIBOBJ invocation from here... * modules/pipe-posix (configure.ac): ... to here. diff --git a/m4/poll.m4 b/m4/poll.m4 index d226e1c01..e489df7a0 100644 --- a/m4/poll.m4 +++ b/m4/poll.m4 @@ -1,4 +1,4 @@ -# poll.m4 serial 13 +# poll.m4 serial 14 dnl Copyright (c) 2003, 2005-2007, 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, @@ -63,8 +63,7 @@ This is MacOSX or AIX fi fi if test $HAVE_POLL = 0 || test $REPLACE_POLL = 1; then - AC_LIBOBJ([poll]) - gl_PREREQ_POLL + : else AC_DEFINE([HAVE_POLL], [1], [Define to 1 if you have the 'poll' function and it works.]) diff --git a/modules/poll b/modules/poll index 478e99ba7..f1f22bfd8 100644 --- a/modules/poll +++ b/modules/poll @@ -15,6 +15,10 @@ errno [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1] configure.ac: gl_FUNC_POLL +if test $HAVE_POLL = 0 || test $REPLACE_POLL = 1; then + AC_LIBOBJ([poll]) + gl_PREREQ_POLL +fi gl_POLL_MODULE_INDICATOR([poll]) Makefile.am: -- 2.11.0