waitpid: Move AC_LIBOBJ invocations to module description.

* m4/waitpid.m4 (gl_FUNC_WAITPID): Set HAVE_WAITPID. Move AC_LIBOBJ
invocation from here...
* modules/waitpid (configure.ac): ... to here.

diff --git a/ChangeLog b/ChangeLog
index 6c8fb2f47aa10b840af5ab08005997cad7035795..773cd340011d509560e3e37ebba3565ac714e244 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
+       waitpid: Move AC_LIBOBJ invocations to module description.
+       * m4/waitpid.m4 (gl_FUNC_WAITPID): Set HAVE_WAITPID. Move AC_LIBOBJ
+       invocation from here...
+       * modules/waitpid (configure.ac): ... to here.
+
 2011-05-22  Bruno Haible  <bruno@clisp.org>
 
        utimensat: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/waitpid.m4 b/m4/waitpid.m4
index ccc25e4c5b1dc23ec1f8fda058ad47c203318228..ceeeeeddf12cf46d8edc3822a895e5da6873d657 100644 (file)
--- a/m4/waitpid.m4
+++ b/m4/waitpid.m4
@@ -1,4 +1,4 @@
-# waitpid.m4 serial 1
+# waitpid.m4 serial 2
 dnl Copyright (C) 2010-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,9 +7,8 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_WAITPID],
 [
   AC_REQUIRE([AC_CANONICAL_HOST])
+  HAVE_WAITPID=1
   case $host_os in
-    mingw*)
-      AC_LIBOBJ([waitpid])
-      ;;
+    mingw*) HAVE_WAITPID=0 ;;
   esac
 ])

diff --git a/modules/waitpid b/modules/waitpid
index f9699c6c5f915ccacae589188469a5535d486fd5..59e0375bbc2ea625d47c15f07f4280b33f22300b 100644 (file)
--- a/modules/waitpid
+++ b/modules/waitpid
@@ -10,6 +10,9 @@ sys_wait
 
 configure.ac:
 gl_FUNC_WAITPID
+if test $HAVE_WAITPID = 0; then
+  AC_LIBOBJ([waitpid])
+fi
 gl_SYS_WAIT_MODULE_INDICATOR([waitpid])
 
 Makefile.am: