Mercurial > hg > octave-lojdl > gnulib-hg

changeset 15137:cd39335cd16a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bruno Haible <bruno@clisp.org>
date Sun, 22 May 2011 17:50:15 +0200
parents dfb2d3c2caa7
children 1f1394e97ddf
files ChangeLog m4/waitpid.m4 modules/waitpid
diffstat 3 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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
 ])
--- 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: