# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1306079415 -7200
# Node ID cd39335cd16a827b7020fcfbc9f924758e3f47c4
# Parent  dfb2d3c2caa70e48befb5b1491e045ae887197bf
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
--- 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
--- 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 @@
 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
--- a/modules/waitpid
+++ b/modules/waitpid
@@ -10,6 +10,9 @@
 
 configure.ac:
 gl_FUNC_WAITPID
+if test $HAVE_WAITPID = 0; then
+  AC_LIBOBJ([waitpid])
+fi
 gl_SYS_WAIT_MODULE_INDICATOR([waitpid])
 
 Makefile.am: