From f80b106d15b4e21c7d06ea5b76f1d5cf45dc52ee Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 9 Sep 2023 18:51:51 -0700
Subject: [PATCH] =?UTF-8?q?grep:=20omit=20propername,=20as=20it=E2=80=99s?=
 =?UTF-8?q?=20not=20used?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Omit Gnulib’s propername module, as it has not been used since my
commit 3c0a36e514237132db711bfef57a74c64592c4e2 dated Thu Dec 20
16:35:55 2018 -0800.
* bootstrap.conf (avoided_gnulib_modules):
Do not avoid mbchar, as it is no longer pulled in by propername.
(gnulib_modules): Remove propername.
* src/Makefile.am (LDADD):
* tests/Makefile.am (LDADD): Remove $(LIBICONV); no longer needed.
* src/grep.c: Do not include propername.h.
---
 bootstrap.conf    | 2 --
 src/Makefile.am   | 2 +-
 src/grep.c        | 1 -
 tests/Makefile.am | 2 +-
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/bootstrap.conf b/bootstrap.conf
index 3dd9bd7..66430d9 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -17,7 +17,6 @@
 
 avoided_gnulib_modules='
   --avoid=lock-tests
-  --avoid=mbchar
   --avoid=mbuiter
   --avoid=mbuiterf
   --avoid=mbrtowc-tests
@@ -76,7 +75,6 @@ minmax
 obstack
 openat-safer
 perl
-propername
 rawmemchr
 readme-release
 realloc-gnu
diff --git a/src/Makefile.am b/src/Makefile.am
index f8555fe..426339f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,7 +42,7 @@ noinst_HEADERS = grep.h kwset.h search.h system.h
 # But libgreputils.a must also follow $(LIBINTL), since libintl uses
 # replacement functions defined in libgreputils.a.
 LDADD = \
-  ../lib/libgreputils.a $(LIBINTL) ../lib/libgreputils.a $(LIBICONV) \
+  ../lib/libgreputils.a $(LIBINTL) ../lib/libgreputils.a \
   $(HARD_LOCALE_LIB) $(LIBC32CONV) \
   $(LIBSIGSEGV) $(LIBUNISTRING) $(MBRTOWC_LIB) $(SETLOCALE_NULL_LIB) \
   $(LIBTHREAD)
diff --git a/src/grep.c b/src/grep.c
index a2a1c1f..8bda853 100644
--- a/src/grep.c
+++ b/src/grep.c
@@ -45,7 +45,6 @@
 #include "grep.h"
 #include "hash.h"
 #include "intprops.h"
-#include "propername.h"
 #include "safe-read.h"
 #include "search.h"
 #include "c-strcase.h"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 94430a9..9c09c43 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -42,7 +42,7 @@ 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 \
-  $(HARD_LOCALE_LIB) $(LIBC32CONV) $(LIBCSTACK) $(LIBICONV) \
+  $(HARD_LOCALE_LIB) $(LIBC32CONV) $(LIBCSTACK) \
   $(LIBSIGSEGV) $(LIBUNISTRING) $(MBRTOWC_LIB) $(SETLOCALE_NULL_LIB) \
   $(LIBTHREAD)