From: Bruno Haible <bruno@clisp.org>
Date: Tue, 20 Sep 2022 22:12:38 +0000 (+0200)
Subject: build: Simplify.
X-Git-Tag: v0.22~178
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e27f14e94f160a1fa04ea5e4c2cf0b9b30fb972f;p=thirdparty%2Fgettext.git

build: Simplify.

This partially reverts the commit 2020-12-28 "Update after gnulib changed:
Fix link errors on native Windows."

* autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC, GNULIB_MODULES_LIBGETTEXTPO): Remove
strdup-posix.
* gettext-tools/libgettextpo/Makefile.am (config.h): Don't define GNULIB_GETCWD.
---

diff --git a/autogen.sh b/autogen.sh
index 5aa2a0c71..82fb8eb6f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -209,7 +209,6 @@ if ! $skip_gnulib; then
     stpncpy
     strchrnul
     strcspn
-    strdup-posix
     strerror
     strpbrk
     strtol
@@ -350,7 +349,6 @@ if ! $skip_gnulib; then
     stpcpy
     stpncpy
     strchrnul
-    strdup-posix
     strerror
     unictype/ctype-space
     unilbrk/ulc-width-linebreaks
diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am
index f88f8d1d6..bc86b720b 100644
--- a/gettext-tools/libgettextpo/Makefile.am
+++ b/gettext-tools/libgettextpo/Makefile.am
@@ -158,8 +158,6 @@ config.h: $(BUILT_SOURCES)
 	  echo '#define GTPO_CONFIG_H'; \
 	  echo; \
 	  echo '#include "../config.h"'; \
-	  : "We use gnulib module 'getcwd-lgpl' here, not module 'getcwd'."; \
-	  echo '#undef GNULIB_GETCWD'; \
 	  : "We don't use gnulib module 'fchdir' here."; \
 	  echo '#undef REPLACE_FCHDIR'; \
 	  : "Turn all gettext() calls into dgettext() calls."; \