summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--m4/nanosleep.m46
-rw-r--r--modules/nanosleep4
3 files changed, 12 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 17e47fca24..d120138ce8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2011-05-21 Bruno Haible <bruno@clisp.org>
+ nanosleep: Move AC_LIBOBJ invocations to module description.
+ * m4/nanosleep.m4 (gl_FUNC_NANOSLEEP): Move AC_LIBOBJ and
+ gl_PREREQ_NANOSLEEP invocations from here...
+ * modules/nanosleep (configure.ac): ... to here.
+
+2011-05-21 Bruno Haible <bruno@clisp.org>
+
mountlist: Move AC_LIBOBJ invocations to module description.
* m4/mountlist.m4 (gl_MOUNTLIST): Move AC_LIBOBJ and
gl_PREREQ_MOUNTLIST_EXTRA invocations from here...
diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4
index 34493bb3a6..6218641123 100644
--- a/m4/nanosleep.m4
+++ b/m4/nanosleep.m4
@@ -1,4 +1,4 @@
-# serial 33
+# serial 34
dnl From Jim Meyering.
dnl Check for the nanosleep function.
@@ -121,10 +121,6 @@ AC_DEFUN([gl_FUNC_NANOSLEEP],
HAVE_NANOSLEEP=0
fi
LIBS=$nanosleep_save_libs
- if test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1; then
- AC_LIBOBJ([nanosleep])
- gl_PREREQ_NANOSLEEP
- fi
])
# Prerequisites of lib/nanosleep.c.
diff --git a/modules/nanosleep b/modules/nanosleep
index 32af74b9fb..61c9b9648a 100644
--- a/modules/nanosleep
+++ b/modules/nanosleep
@@ -19,6 +19,10 @@ verify [test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1]
configure.ac:
gl_FUNC_NANOSLEEP
+if test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1; then
+ AC_LIBOBJ([nanosleep])
+ gl_PREREQ_NANOSLEEP
+fi
gl_TIME_MODULE_INDICATOR([nanosleep])
Makefile.am: