From: Bruno Haible <bruno@clisp.org>
Date: Sat, 21 May 2011 14:58:50 +0000 (+0200)
Subject: poll: Move AC_LIBOBJ invocations to module description.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=752f38f3ea77b7f20360bc3d5912eb22e288faed;p=pspp

poll: Move AC_LIBOBJ invocations to module description.

* m4/poll.m4 (gl_FUNC_POLL): Move AC_LIBOBJ and gl_PREREQ_POLL
invocations from here...
* modules/poll (configure.ac): ... to here.
---

diff --git a/ChangeLog b/ChangeLog
index f2cd4ef831..9f4d73ca81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
+	poll: Move AC_LIBOBJ invocations to module description.
+	* m4/poll.m4 (gl_FUNC_POLL): Move AC_LIBOBJ and gl_PREREQ_POLL
+	invocations from here...
+	* modules/poll (configure.ac): ... to here.
+
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
 	pipe-posix: Move AC_LIBOBJ invocations to module description.
diff --git a/m4/poll.m4 b/m4/poll.m4
index d226e1c011..e489df7a00 100644
--- a/m4/poll.m4
+++ b/m4/poll.m4
@@ -1,4 +1,4 @@
-# poll.m4 serial 13
+# poll.m4 serial 14
 dnl Copyright (c) 2003, 2005-2007, 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,
@@ -63,8 +63,7 @@ This is MacOSX or AIX
     fi
   fi
   if test $HAVE_POLL = 0 || test $REPLACE_POLL = 1; then
-    AC_LIBOBJ([poll])
-    gl_PREREQ_POLL
+    :
   else
     AC_DEFINE([HAVE_POLL], [1],
       [Define to 1 if you have the 'poll' function and it works.])
diff --git a/modules/poll b/modules/poll
index 478e99ba74..f1f22bfd81 100644
--- a/modules/poll
+++ b/modules/poll
@@ -15,6 +15,10 @@ errno           [test $HAVE_POLL = 0 || test $REPLACE_POLL = 1]
 
 configure.ac:
 gl_FUNC_POLL
+if test $HAVE_POLL = 0 || test $REPLACE_POLL = 1; then
+  AC_LIBOBJ([poll])
+  gl_PREREQ_POLL
+fi
 gl_POLL_MODULE_INDICATOR([poll])
 
 Makefile.am: