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 491c6de0f31433d1b0463258eb254dd298f4f592..7654589f78c66094219ee46bcccbd3a71670f417 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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.

diff --git a/m4/select.m4 b/m4/select.m4
index 0b21c97a0b81615efedff8bb6233292dee6a25cb..d9c3465b12889e9923385039de2045c7d60b39ac 100644 (file)
--- 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 c6412c16379e6cb546551a10ff63f9b5a9325c4c..5969a4eaf20680b05b86d719b5f31418912e2255 100644 (file)
--- 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: