Mercurial > hg > octave-lojdl > gnulib-hg

changeset 15087:b4000fa9527e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bruno Haible <bruno@clisp.org>
date Sat, 21 May 2011 22:33:02 +0200
parents db3551a524d0
children 809af8ef1bf3
files ChangeLog m4/select.m4 modules/select
diffstat 3 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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...
--- 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_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 @@
       ])
     case "$gl_cv_func_select_supports0" in
       *yes) ;;
-      *)
-        REPLACE_SELECT=1
-        AC_LIBOBJ([select])
-        ;;
+      *) REPLACE_SELECT=1 ;;
     esac
   fi
 ])
--- a/modules/select
+++ b/modules/select
@@ -12,6 +12,9 @@
 
 configure.ac:
 gl_FUNC_SELECT
+if test $REPLACE_SELECT = 1; then
+  AC_LIBOBJ([select])
+fi
 gl_SYS_SELECT_MODULE_INDICATOR([select])
 
 Makefile.am: