>From b98a5b9d89ff223cd6d543c4f8d0ace24b228bce Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 Jan 2023 11:33:28 +0100
Subject: [PATCH 06/18] getlogin, getlogin_r: Rename LIB_GETLOGIN to
 GETLOGIN_LIB.

* m4/getlogin.m4: Rename LIB_GETLOGIN to GETLOGIN_LIB.
All uses changed.
* NEWS: Mention the change.
---
 ChangeLog                | 7 +++++++
 NEWS                     | 3 +++
 m4/getlogin.m4           | 9 ++++++---
 modules/getlogin         | 2 +-
 modules/getlogin-tests   | 2 +-
 modules/getlogin_r       | 2 +-
 modules/getlogin_r-tests | 2 +-
 modules/unistd-c++-tests | 2 +-
 8 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 37e86accff..9497f9ce93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2023-01-07  Bruno Haible  <bruno@clisp.org>
+
+	getlogin, getlogin_r: Rename LIB_GETLOGIN to GETLOGIN_LIB.
+	* m4/getlogin.m4: Rename LIB_GETLOGIN to GETLOGIN_LIB.
+	All uses changed.
+	* NEWS: Mention the change.
+
 2023-01-07  Bruno Haible  <bruno@clisp.org>
 
 	gethrxtime: Rename LIB_GETHRXTIME to GETHRXTIME_LIB.
diff --git a/NEWS b/NEWS
index 12a0e469ce..0b6da8e542 100644
--- a/NEWS
+++ b/NEWS
@@ -74,6 +74,9 @@ User visible incompatible changes
 
 Date        Modules         Changes
 
+2023-01-07  getlogin        Link with $(GETLOGIN_LIB) instead of
+            getlogin_r      $(LIB_GETLOGIN).
+
 2023-01-07  gethrxtime      Link with $(GETHRXTIME_LIB) instead of
                             $(LIB_GETHRXTIME).
 
diff --git a/m4/getlogin.m4 b/m4/getlogin.m4
index 142a2a94ad..0686b5f079 100644
--- a/m4/getlogin.m4
+++ b/m4/getlogin.m4
@@ -1,4 +1,4 @@
-# getlogin.m4 serial 5
+# getlogin.m4 serial 6
 dnl Copyright (C) 2010-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,
@@ -24,9 +24,12 @@ AC_DEFUN([gl_LIB_GETLOGIN],
   AC_REQUIRE([AC_CANONICAL_HOST])
   case $host_os in
     mingw*)
-      LIB_GETLOGIN='-ladvapi32' ;;
+      GETLOGIN_LIB='-ladvapi32' ;;
     *)
-      LIB_GETLOGIN= ;;
+      GETLOGIN_LIB= ;;
   esac
+  AC_SUBST([GETLOGIN_LIB])
+  dnl For backward compatibility.
+  LIB_GETLOGIN="$GETLOGIN_LIB"
   AC_SUBST([LIB_GETLOGIN])
 ])
diff --git a/modules/getlogin b/modules/getlogin
index 0a88c92e0e..c73b2a9a2e 100644
--- a/modules/getlogin
+++ b/modules/getlogin
@@ -23,7 +23,7 @@ Include:
 <unistd.h>
 
 Link:
-$(LIB_GETLOGIN)
+$(GETLOGIN_LIB)
 
 License:
 LGPLv2+
diff --git a/modules/getlogin-tests b/modules/getlogin-tests
index 5056a9ca47..b8fff1e3f5 100644
--- a/modules/getlogin-tests
+++ b/modules/getlogin-tests
@@ -12,4 +12,4 @@ configure.ac:
 Makefile.am:
 TESTS += test-getlogin
 check_PROGRAMS += test-getlogin
-test_getlogin_LDADD = $(LDADD) $(LIB_GETLOGIN)
+test_getlogin_LDADD = $(LDADD) $(GETLOGIN_LIB)
diff --git a/modules/getlogin_r b/modules/getlogin_r
index b5f356a123..843bcde19c 100644
--- a/modules/getlogin_r
+++ b/modules/getlogin_r
@@ -31,7 +31,7 @@ Include:
 <unistd.h>
 
 Link:
-$(LIB_GETLOGIN)
+$(GETLOGIN_LIB)
 
 License:
 LGPLv2+
diff --git a/modules/getlogin_r-tests b/modules/getlogin_r-tests
index 7918ebd183..b53a729efa 100644
--- a/modules/getlogin_r-tests
+++ b/modules/getlogin_r-tests
@@ -12,4 +12,4 @@ configure.ac:
 Makefile.am:
 TESTS += test-getlogin_r
 check_PROGRAMS += test-getlogin_r
-test_getlogin_r_LDADD = $(LDADD) $(LIB_GETLOGIN)
+test_getlogin_r_LDADD = $(LDADD) $(GETLOGIN_LIB)
diff --git a/modules/unistd-c++-tests b/modules/unistd-c++-tests
index b4fb9f80a4..4028a1178a 100644
--- a/modules/unistd-c++-tests
+++ b/modules/unistd-c++-tests
@@ -15,5 +15,5 @@ if ANSICXX
 TESTS += test-unistd-c++
 check_PROGRAMS += test-unistd-c++
 test_unistd_c___SOURCES = test-unistd-c++.cc
-test_unistd_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN) $(LIBSOCKET) $(LIB_GETLOGIN) $(LIB_GETRANDOM)
+test_unistd_c___LDADD = $(LDADD) $(LIBINTL) $(CLOCK_TIME_LIB) $(EUIDACCESS_LIBGEN) $(LIBSOCKET) $(GETLOGIN_LIB) $(LIB_GETRANDOM)
 endif
-- 
2.34.1