grep branch, master, updated. v3.11-11-g105e432

[Paul Eggert]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  105e432d7fb4ff51f11097242b9ecb8d73c40aea (commit)
      from  9e915da3429f0a1b490667f69042d58a9ec6d64b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=105e432d7fb4ff51f11097242b9ecb8d73c40aea


commit 105e432d7fb4ff51f11097242b9ecb8d73c40aea
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Jul 11 18:14:14 2023 -0700

    maint: link with mbrtc32-required libraries
    
    Add libraries now suggested by gnulib-tool.
    * src/Makefile.am (LDADD):
    * tests/Makefile.am (LDADD):
    Add $(HARD_LOCALE_LIB), $(LIBC32CONV), $(LIBSIGSEGV),
    $(LIBUNISTRING), $(MBRTOWC_LIB), $(SETLOCALE_NULL_LIB).
    * tests/Makefile.am (LDADD):
    Also add $(LIBCSTACK), $(LIBICONV), $(LIBTHREAD).

diff --git a/src/Makefile.am b/src/Makefile.am
index 2c5a9fe..f8555fe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,6 +43,8 @@ noinst_HEADERS = grep.h kwset.h search.h system.h
 # replacement functions defined in libgreputils.a.
 LDADD = \
   ../lib/libgreputils.a $(LIBINTL) ../lib/libgreputils.a $(LIBICONV) \
+  $(HARD_LOCALE_LIB) $(LIBC32CONV) \
+  $(LIBSIGSEGV) $(LIBUNISTRING) $(MBRTOWC_LIB) $(SETLOCALE_NULL_LIB) \
   $(LIBTHREAD)
 
 grep_LDADD = $(LDADD) $(PCRE_LIBS) $(LIBCSTACK)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9b4422e..d566445 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -41,7 +41,10 @@ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 
 # Tell the linker to omit references to unused shared libraries.
 AM_LDFLAGS = $(IGNORE_UNUSED_LIBRARIES_CFLAGS)
-LDADD = ../lib/libgreputils.a $(LIBINTL) ../lib/libgreputils.a
+LDADD = ../lib/libgreputils.a $(LIBINTL) ../lib/libgreputils.a \
+  $(HARD_LOCALE_LIB) $(LIBC32CONV) $(LIBCSTACK) $(LIBICONV) \
+  $(LIBSIGSEGV) $(LIBUNISTRING) $(MBRTOWC_LIB) $(SETLOCALE_NULL_LIB) \
+  $(LIBTHREAD)
 
 # The triple-backref test is expected to fail with both the system
 # matcher (i.e., with glibc) and with the included matcher.

-----------------------------------------------------------------------

Summary of changes:
 src/Makefile.am   | 2 ++
 tests/Makefile.am | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
grep