]> Savannah Git Hosting - gnulib.git/commitdiff
select: Rename LIB_SELECT to SELECT_LIB.
authorBruno Haible <bruno@clisp.org>
Sat, 7 Jan 2023 13:52:00 +0000 (14:52 +0100)
committerBruno Haible <bruno@clisp.org>
Sat, 7 Jan 2023 17:06:52 +0000 (18:06 +0100)
* m4/select.m4: Rename LIB_SELECT to SELECT_LIB.
All uses changed.
* NEWS: Mention the change.

ChangeLog
NEWS
m4/select.m4
modules/pselect
modules/pselect-tests
modules/select
modules/select-tests
modules/sys_select-c++-tests

index 634203127f7629cb7624c2ef7a970200723ab9b8..c0e203199710e0f474bfd8dca690d4346269e463 100644 (file)
--- 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 e5605ee2950bc6785b018ad4200403cb985d613d..397109252c0f253f07a607440f59c876a2c89b20 100644 (file)
--- 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).
 
index 96ffa13beba9f4521000279e55bf96fb34cc74cf..b5cffd6055249ca89e90584018612eb27485132c 100644 (file)
@@ -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])
 ])
index 8c4c396f7af4c4588b1de2b22b4a5fa17efd2276..36037a59b3061a2b5ee2fb88a2d1270077760a42 100644 (file)
@@ -26,7 +26,7 @@ Include:
 <sys/select.h>
 
 Link:
-$(LIB_SELECT)
+$(SELECT_LIB)
 $(PTHREAD_SIGMASK_LIB)
 
 License:
index d7441f093750e8a5c015a0ca86e0e65fbae2800d..dd41a7026f19a2d721da93dd58bd49324a76d18e 100644 (file)
@@ -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)
index fd3529315c6097a3cc58e956b64c995d16b9d7c6..213fb78656cf121b1f2a6c7623c951b43e0f3a72 100644 (file)
@@ -27,7 +27,7 @@ Include:
 <sys/select.h>
 
 Link:
-$(LIB_SELECT)
+$(SELECT_LIB)
 
 License:
 LGPLv2+
index 899b50cddfcf8901ac13ec84e64e35888b991520..f62130dd9cd666a3df357ee8d13f79359f1b1186 100644 (file)
@@ -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@
index e9d04175776eea23e5cf9e30810297ff54675832..fc93cbfd54b1a63c5259823691196fd55134c266 100644 (file)
@@ -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