branch master updated: gnulib LDADD

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 2e4bf5e5fd gnulib LDADD
2e4bf5e5fd is described below

commit 2e4bf5e5fda1e62cf7b4d3499982eedb836427ef
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Aug 13 20:53:41 2023 +0100

    gnulib LDADD
    
    * info/Makefile.am (LDADD), install-info/Makefile.am (LDADD):
    Revise and extend variable use from gnulib so that the correct
    libraries will be linked on various platforms reliably.
---
 ChangeLog                |  8 ++++++++
 info/Makefile.am         | 11 ++++++++++-
 install-info/Makefile.am |  6 +++++-
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3a48ae9e79..52fc10c121 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-08-13  Gavin Smith <gavinsmith0123@gmail.com>
+
+       gnulib LDADD
+
+       * info/Makefile.am (LDADD), install-info/Makefile.am (LDADD):
+       Revise and extend variable use from gnulib so that the correct
+       libraries will be linked on various platforms reliably.
+
 2023-08-13  Gavin Smith <gavinsmith0123@gmail.com>
 
        Run "gnulib-tool --add-import" (top level)
diff --git a/info/Makefile.am b/info/Makefile.am
index 595aff1064..4b524c1c31 100644
--- a/info/Makefile.am
+++ b/info/Makefile.am
@@ -25,7 +25,16 @@ AM_CPPFLAGS =                                   \
   -DINFODIR=\"$(infodir)\"                      \
   -DINFODIR2=\"$(datadir)/info\"
 
-LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(TERMLIBS) $(LIBINTL) $(LIBICONV) 
$(LIBTHREAD)
+LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(TERMLIBS)
+
+# for various gnulib modules
+LDADD += $(LIBINTL) $(LIBICONV) $(LIBC32CONV) $(LIBUNISTRING) $(LIBTHREAD)
+
+# for hard-locale gnulib module which is brought in indirectly
+LDADD += $(HARD_LOCALE_LIB) $(SETLOCALE_NULL_LIB)
+
+# for mbrtowc gnulib module which is brought in indirectly
+LDADD += $(MBRTOWC_LIB)
 
 EXTRA_DIST = pcterm.c
 
diff --git a/install-info/Makefile.am b/install-info/Makefile.am
index b53cc3dcb9..619d20473e 100644
--- a/install-info/Makefile.am
+++ b/install-info/Makefile.am
@@ -33,4 +33,8 @@ AM_CPPFLAGS =                                         \
   -I$(top_srcdir)/gnulib/lib                   \
   -I$(top_builddir)/gnulib/lib                 \
   -DLOCALEDIR=\"$(localedir)\"
-LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) $(LIBTHREAD) 
$(GETRANDOM_LIB)
+
+LDADD = $(top_builddir)/gnulib/lib/libgnu.a $(LIBINTL) $(LIBTHREAD)
+
+# for mkstemp gnulib module
+LDADD += $(GETRANDOM_LIB) $(CLOCK_TIME_LIB)