From: Bruno Haible <bruno@clisp.org>
Date: Sat, 21 May 2011 20:33:02 +0000 (+0200)
Subject: select: Respect rules for use of AC_LIBOBJ.
X-Git-Tag: v0.1~2439
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=922d06f1de3c506b709cfb9ecab8cf0d5d146cf0;p=gnulib.git

select: Respect rules for use of AC_LIBOBJ.

* m4/select.m4 (gl_FUNC_SELECT): Move AC_LIBOBJ invocations from
here...
* modules/select (configure.ac): ... to here.
---

diff --git a/ChangeLog b/ChangeLog
index 491c6de0f..7654589f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
+	select: Respect rules for use of AC_LIBOBJ.
+	* m4/select.m4 (gl_FUNC_SELECT): Move AC_LIBOBJ invocations from
+	here...
+	* modules/select (configure.ac): ... to here.
+
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
 	scandir: Move AC_LIBOBJ invocations to module description.
 	* m4/scandir.m4 (gl_FUNC_SCANDIR): Move AC_LIBOBJ and gl_PREREQ_SCANDIR
 	invocations from here...
diff --git a/m4/select.m4 b/m4/select.m4
index 0b21c97a0..d9c3465b1 100644
--- a/m4/select.m4
+++ b/m4/select.m4
@@ -1,4 +1,4 @@
-# select.m4 serial 4
+# select.m4 serial 5
 dnl Copyright (C) 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,
@@ -11,7 +11,6 @@ AC_DEFUN([gl_FUNC_SELECT],
   AC_REQUIRE([gl_SOCKETS])
   if test "$ac_cv_header_winsock2_h" = yes; then
     REPLACE_SELECT=1
-    AC_LIBOBJ([select])
   else
     dnl On Interix 3.5, select(0, NULL, NULL, NULL, timeout) fails with error
     dnl EFAULT.
@@ -45,10 +44,7 @@ changequote([,])dnl
       ])
     case "$gl_cv_func_select_supports0" in
       *yes) ;;
-      *)
-        REPLACE_SELECT=1
-        AC_LIBOBJ([select])
-        ;;
+      *) REPLACE_SELECT=1 ;;
     esac
   fi
 ])
diff --git a/modules/select b/modules/select
index c6412c163..5969a4eaf 100644
--- a/modules/select
+++ b/modules/select
@@ -12,6 +12,9 @@ sockets         [test $REPLACE_SELECT = 1]
 
 configure.ac:
 gl_FUNC_SELECT
+if test $REPLACE_SELECT = 1; then
+  AC_LIBOBJ([select])
+fi
 gl_SYS_SELECT_MODULE_INDICATOR([select])
 
 Makefile.am: