>From 0332816b4ef61d2afb0784f15b0e66a760488212 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 14:52:00 +0100
Subject: [PATCH 15/18] select: Rename LIB_SELECT to SELECT_LIB.

* m4/select.m4: Rename LIB_SELECT to SELECT_LIB.
All uses changed.
* NEWS: Mention the change.
---
 ChangeLog                    | 7 +++++++
 NEWS                         | 2 ++
 m4/select.m4                 | 9 ++++++---
 modules/pselect              | 2 +-
 modules/pselect-tests        | 2 +-
 modules/select               | 2 +-
 modules/select-tests         | 6 +++---
 modules/sys_select-c++-tests | 2 +-
 8 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 634203127f..c0e2031997 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-07  Bruno Haible  <bruno@clisp.org>
+
+	select: Rename LIB_SELECT to SELECT_LIB.
+	* m4/select.m4: Rename LIB_SELECT to SELECT_LIB.
+	All uses changed.
+	* NEWS: Mention the change.
+
 2023-01-07  Bruno Haible  <bruno@clisp.org>
 
 	sched_yield: Rename LIB_SCHED_YIELD to SCHED_YIELD_LIB.
diff --git a/NEWS b/NEWS
index e5605ee295..397109252c 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,8 @@ User visible incompatible changes
 
 Date        Modules         Changes
 
+2023-01-07  select          Link with $(SELECT_LIB) instead of $(LIB_SELECT).
+
 2023-01-07  sched_yield     Link with $(SCHED_YIELD_LIB) instead of
                             $(LIB_SCHED_YIELD).
 
diff --git a/m4/select.m4 b/m4/select.m4
index 96ffa13beb..b5cffd6055 100644
--- a/m4/select.m4
+++ b/m4/select.m4
@@ -1,4 +1,4 @@
-# select.m4 serial 13
+# select.m4 serial 14
 dnl Copyright (C) 2009-2023 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -91,7 +91,7 @@ changequote([,])dnl
   fi
 
   dnl Determine the needed libraries.
-  LIB_SELECT="$LIBSOCKET"
+  SELECT_LIB="$LIBSOCKET"
   if test $REPLACE_SELECT = 1; then
     case "$host_os" in
       mingw*)
@@ -109,9 +109,12 @@ main ()
   return 0;
 }]])],
           [],
-          [LIB_SELECT="$LIB_SELECT -luser32"])
+          [SELECT_LIB="$SELECT_LIB -luser32"])
         ;;
     esac
   fi
+  AC_SUBST([SELECT_LIB])
+  dnl For backward compatibility.
+  LIB_SELECT="$LIB_SELECT"
   AC_SUBST([LIB_SELECT])
 ])
diff --git a/modules/pselect b/modules/pselect
index 8c4c396f7a..36037a59b3 100644
--- a/modules/pselect
+++ b/modules/pselect
@@ -26,7 +26,7 @@ Include:
 <sys/select.h>
 
 Link:
-$(LIB_SELECT)
+$(SELECT_LIB)
 $(PTHREAD_SIGMASK_LIB)
 
 License:
diff --git a/modules/pselect-tests b/modules/pselect-tests
index d7441f0937..dd41a7026f 100644
--- a/modules/pselect-tests
+++ b/modules/pselect-tests
@@ -30,4 +30,4 @@ AC_CHECK_HEADERS_ONCE([sys/wait.h])
 Makefile.am:
 TESTS += test-pselect
 check_PROGRAMS += test-pselect
-test_pselect_LDADD = $(LDADD) @LIB_SELECT@ @LIBSOCKET@ @PTHREAD_SIGMASK_LIB@ $(INET_PTON_LIB)
+test_pselect_LDADD = $(LDADD) @SELECT_LIB@ @LIBSOCKET@ @PTHREAD_SIGMASK_LIB@ $(INET_PTON_LIB)
diff --git a/modules/select b/modules/select
index fd3529315c..213fb78656 100644
--- a/modules/select
+++ b/modules/select
@@ -27,7 +27,7 @@ Include:
 <sys/select.h>
 
 Link:
-$(LIB_SELECT)
+$(SELECT_LIB)
 
 License:
 LGPLv2+
diff --git a/modules/select-tests b/modules/select-tests
index 899b50cddf..f62130dd9c 100644
--- a/modules/select-tests
+++ b/modules/select-tests
@@ -37,6 +37,6 @@ Makefile.am:
 TESTS += test-select test-select-in.sh test-select-out.sh
 # test-select-stdin has to be run by hand.
 check_PROGRAMS += test-select test-select-fd test-select-stdin
-test_select_LDADD = $(LDADD) @LIB_SELECT@ @LIBSOCKET@ $(INET_PTON_LIB)
-test_select_fd_LDADD = $(LDADD) @LIB_SELECT@
-test_select_stdin_LDADD = $(LDADD) @LIB_SELECT@
+test_select_LDADD = $(LDADD) @SELECT_LIB@ @LIBSOCKET@ $(INET_PTON_LIB)
+test_select_fd_LDADD = $(LDADD) @SELECT_LIB@
+test_select_stdin_LDADD = $(LDADD) @SELECT_LIB@
diff --git a/modules/sys_select-c++-tests b/modules/sys_select-c++-tests
index e9d0417577..fc93cbfd54 100644
--- a/modules/sys_select-c++-tests
+++ b/modules/sys_select-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
 TESTS += test-sys_select-c++
 check_PROGRAMS += test-sys_select-c++
 test_sys_select_c___SOURCES = test-sys_select-c++.cc
-test_sys_select_c___LDADD = $(LDADD) $(LIBINTL) $(LIB_SELECT) $(NANOSLEEP_LIB)
+test_sys_select_c___LDADD = $(LDADD) $(LIBINTL) $(SELECT_LIB) $(NANOSLEEP_LIB)
 endif
-- 
2.34.1