summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2011-05-22 17:42:05 +0200
committerBruno Haible <bruno@clisp.org>2011-06-16 00:07:04 +0200
commit269b74bfc8dac28d8a9c6c3e7232c2641433e073 (patch)
tree5a86f0941f52843d8ec57714feab77bb1616f3d5
parentefc0d3c24f7c561a56518af3220eed55490155cd (diff)
downloadgnulib-269b74bfc8dac28d8a9c6c3e7232c2641433e073.tar.gz
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.
-rw-r--r--ChangeLog7
-rw-r--r--m4/usleep.m44
-rw-r--r--modules/usleep3
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9dc38fbe87..ca1d6e8ee0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2011-05-22 Bruno Haible <bruno@clisp.org>
+ 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 <bruno@clisp.org>
+
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 a41cbb106f..3e96a1624b 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 <sys/types.h> 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 0bee1cc8b0..563df42316 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: