From: Bruno Haible <bruno@clisp.org>
Date: Mon, 19 Jun 2023 15:22:58 +0000 (+0200)
Subject: build: Stop using the gnulib module 'gettext'.
X-Git-Tag: v0.23~423
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4563939bc09cdf7c4497d2c38306849d26b6795b;p=thirdparty%2Fgettext.git

build: Stop using the gnulib module 'gettext'.

This avoids possible trouble due to divergences between gettext and gnulib.

* autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC): Remove 'gettext'.
Avoid an error message if gettext-tools/gnulib-m4/po.m4 does not yet exist.
---

diff --git a/autogen.sh b/autogen.sh
index 76c12916a..983c5500b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -175,7 +175,6 @@ if ! $skip_gnulib; then
     getaddrinfo
     getline
     getopt-gnu
-    gettext
     gettext-h
     iconv
     javacomp
@@ -487,11 +486,15 @@ cp -p gettext-runtime/po/remove-potcdate.sin gettext-tools/po/remove-potcdate.si
 sed_extract_serial='s/^#.* serial \([^ ]*\).*/\1/p
 1q'
 for file in po.m4; do
-  existing_serial=`sed -n -e "$sed_extract_serial" < "gettext-tools/gnulib-m4/$file"`
-  gettext_serial=`sed -n -e "$sed_extract_serial" < "gettext-runtime/m4/$file"`
-  if test -n "$existing_serial" && test -n "$gettext_serial" \
-        && test "$existing_serial" -ge "$gettext_serial" 2> /dev/null; then
-    :
+  if test -f "gettext-tools/gnulib-m4/$file"; then
+    existing_serial=`sed -n -e "$sed_extract_serial" < "gettext-tools/gnulib-m4/$file"`
+    gettext_serial=`sed -n -e "$sed_extract_serial" < "gettext-runtime/m4/$file"`
+    if test -n "$existing_serial" && test -n "$gettext_serial" \
+          && test "$existing_serial" -ge "$gettext_serial" 2> /dev/null; then
+      :
+    else
+      cp -p "gettext-runtime/m4/$file" "gettext-tools/gnulib-m4/$file"
+    fi
   else
     cp -p "gettext-runtime/m4/$file" "gettext-tools/gnulib-m4/$file"
   fi