From 269b74bfc8dac28d8a9c6c3e7232c2641433e073 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 22 May 2011 17:42:05 +0200 Subject: [PATCH] usleep: Move AC_LIBOBJ invocations to module description. * m4/usleep.m4 (gl_FUNC_USLEEP): Move AC_LIBOBJ invocations from here... * modules/usleep (configure.ac): ... to here. --- ChangeLog | 7 +++++++ m4/usleep.m4 | 4 +--- modules/usleep | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9dc38fbe8..ca1d6e8ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-05-22 Bruno Haible + usleep: Move AC_LIBOBJ invocations to module description. + * m4/usleep.m4 (gl_FUNC_USLEEP): Move AC_LIBOBJ invocations from + here... + * modules/usleep (configure.ac): ... to here. + +2011-05-22 Bruno Haible + unlockpt: Move AC_LIBOBJ invocations to module description. * m4/unlockpt.m4 (gl_FUNC_UNLOCKPT): Move AC_LIBOBJ and gl_PREREQ_UNLOCKPT invocations from here... diff --git a/m4/usleep.m4 b/m4/usleep.m4 index a41cbb106..3e96a1624 100644 --- a/m4/usleep.m4 +++ b/m4/usleep.m4 @@ -1,4 +1,4 @@ -# usleep.m4 serial 1 +# usleep.m4 serial 2 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, @@ -18,7 +18,6 @@ AC_DEFUN([gl_FUNC_USLEEP], type if lacks this type.])]) if test $ac_cv_func_usleep = no; then HAVE_USLEEP=0 - AC_LIBOBJ([usleep]) else dnl POSIX allows implementations to reject arguments larger than dnl 999999, but GNU guarantees it will work. @@ -31,7 +30,6 @@ AC_DEFUN([gl_FUNC_USLEEP], [gl_cv_func_usleep_works="guessing no"])]) if test "$gl_cv_func_usleep_works" != yes; then REPLACE_USLEEP=1 - AC_LIBOBJ([usleep]) fi fi ]) diff --git a/modules/usleep b/modules/usleep index 0bee1cc8b..563df4231 100644 --- a/modules/usleep +++ b/modules/usleep @@ -12,6 +12,9 @@ sleep [test $HAVE_USLEEP = 0 || test $REPLACE_USLEEP = 1] configure.ac: gl_FUNC_USLEEP +if test $HAVE_USLEEP = 0 || test $REPLACE_USLEEP = 1; then + AC_LIBOBJ([usleep]) +fi gl_UNISTD_MODULE_INDICATOR([usleep]) Makefile.am: -- 2.11.0