rw.rs ~charadon -- gnu-hello

gnu-hello

Info

Commit...:	24225d705684322f482135e8a2d679485fce0811
Author...:	Collin Funk
Committer:	Reuben Thomas
Date.....:	Tue Jul 2 18:04:21 2024 -0700
Parents..:	f0dab33af133c2df48ba23a8392a151616d88272

Message

maint: remove the obsolete gettext module

* bootstrap.conf (gnulib_modules): Remove gettext. Use the gettext-h
module instead.
* Makefile.am (hello_LDADD): Update libraries according to current
./bootstrap invocation.

Changes

diff --git a/Makefile.am b/Makefile.am
line changes: +8/-1
index 427910c..d0f4a11
--- a/Makefile.am
+++ b/Makefile.am

@@ -37,7 +37,14 @@ SUBDIRS = po
 bin_PROGRAMS = hello
 hello_SOURCES = src/hello.c src/system.h
 
-hello_LDADD = $(LIBINTL) $(top_builddir)/lib/lib$(PACKAGE).a
+hello_LDADD = $(top_builddir)/lib/lib$(PACKAGE).a \
+	$(HARD_LOCALE_LIB) \
+	$(LIBC32CONV) \
+	$(LIBICONV) \
+	$(LIBINTL) \
+	$(LIBUNISTRING) \
+	$(MBRTOWC_LIB) \
+	$(SETLOCALE_NULL_LIB)
 
 localedir = $(datadir)/locale
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@

diff --git a/bootstrap.conf b/bootstrap.conf
line changes: +1/-1
index a8fdd41..4a81c79
--- a/bootstrap.conf
+++ b/bootstrap.conf

@@ -26,7 +26,7 @@ gnulib_modules="
     error
     gendocs
     getopt-gnu
-    gettext
+    gettext-h
     gitlog-to-changelog
     gnu-web-doc-update
     gnupload