>From c356b3955940a6d556af44b1ff7dbd884a2a1435 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 14:28:33 +0100
Subject: [PATCH 11/18] poll: Rename LIB_POLL to POLL_LIB.

* m4/poll.m4: Rename LIB_POLL to POLL_LIB.
All uses changed.
* NEWS: Mention the change.
---
 ChangeLog                | 7 +++++++
 NEWS                     | 2 ++
 m4/poll.m4               | 9 ++++++---
 modules/poll             | 2 +-
 modules/poll-h-c++-tests | 2 +-
 modules/poll-tests       | 2 +-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 521cf5e580..edfd93d690 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-07  Bruno Haible  <bruno@clisp.org>
+
+	poll: Rename LIB_POLL to POLL_LIB.
+	* m4/poll.m4: Rename LIB_POLL to POLL_LIB.
+	All uses changed.
+	* NEWS: Mention the change.
+
 2023-01-07  Bruno Haible  <bruno@clisp.org>
 
 	nanosleep: Rename LIB_NANOSLEEP to NANOSLEEP_LIB.
diff --git a/NEWS b/NEWS
index 7ca0afacf1..894a52404c 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,8 @@ User visible incompatible changes
 
 Date        Modules         Changes
 
+2023-01-07  poll            Link with $(POLL_LIB) instead of $(LIB_POLL).
+
 2023-01-07  nanosleep       Link with $(NANOSLEEP_LIB) instead of
                             $(LIB_NANOSLEEP).
 
diff --git a/m4/poll.m4 b/m4/poll.m4
index 3039a603e7..cfadbf24fd 100644
--- a/m4/poll.m4
+++ b/m4/poll.m4
@@ -1,4 +1,4 @@
-# poll.m4 serial 20
+# poll.m4 serial 21
 dnl Copyright (c) 2003, 2005-2007, 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,
@@ -76,7 +76,7 @@ This is MacOSX or AIX
   fi
 
   dnl Determine the needed libraries.
-  LIB_POLL="$LIBSOCKET"
+  POLL_LIB="$LIBSOCKET"
   if test $HAVE_POLL = 0 || test $REPLACE_POLL = 1; then
     case "$host_os" in
       mingw*)
@@ -94,10 +94,13 @@ main ()
   return 0;
 }]])],
           [],
-          [LIB_POLL="$LIB_POLL -luser32"])
+          [POLL_LIB="$POLL_LIB -luser32"])
         ;;
     esac
   fi
+  AC_SUBST([POLL_LIB])
+  dnl For backward compatibility.
+  LIB_POLL="$POLL_LIB"
   AC_SUBST([LIB_POLL])
 ])
 
diff --git a/modules/poll b/modules/poll
index f626c5e2c6..d423310796 100644
--- a/modules/poll
+++ b/modules/poll
@@ -35,7 +35,7 @@ Include:
 <poll.h>
 
 Link:
-$(LIB_POLL)
+$(POLL_LIB)
 
 License:
 LGPLv2+
diff --git a/modules/poll-h-c++-tests b/modules/poll-h-c++-tests
index 8dd6262bab..1db7fff510 100644
--- a/modules/poll-h-c++-tests
+++ b/modules/poll-h-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
 TESTS += test-poll-h-c++
 check_PROGRAMS += test-poll-h-c++
 test_poll_h_c___SOURCES = test-poll-h-c++.cc
-test_poll_h_c___LDADD = $(LDADD) $(LIB_POLL)
+test_poll_h_c___LDADD = $(LDADD) $(POLL_LIB)
 endif
diff --git a/modules/poll-tests b/modules/poll-tests
index 39d9e04fcd..b5b3ce4fbe 100644
--- a/modules/poll-tests
+++ b/modules/poll-tests
@@ -29,4 +29,4 @@ AC_CHECK_HEADERS_ONCE([unistd.h sys/wait.h])
 Makefile.am:
 TESTS += test-poll
 check_PROGRAMS += test-poll
-test_poll_LDADD = $(LDADD) $(LIB_POLL) @LIBSOCKET@ $(INET_PTON_LIB)
+test_poll_LDADD = $(LDADD) $(POLL_LIB) @LIBSOCKET@ $(INET_PTON_LIB)
-- 
2.34.1