blob: 31b585fc9a9eea2845a652a2915e55bca1f27ba1 [file] [log] [blame]
Andrew Geissler82c905d2020-04-13 13:39:40 -05001From d034239f05cfba849f6ad16eb3f1ea37efbe4f95 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 19 Nov 2019 18:34:00 +0100
4Subject: [PATCH] intl: do not try to use gettext defines that no longer exist
5
6Newer version of gettext no longer define this in m4 files,
7so patch it out until e2fsprogs upstream sorts the situation.
8
9Upstream-Status: Inappropriate [hardcodes a choice]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 intl/Makefile.in | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/intl/Makefile.in b/intl/Makefile.in
16index e037e23c..89a876b8 100644
17--- a/intl/Makefile.in
18+++ b/intl/Makefile.in
19@@ -175,7 +175,7 @@ libgnuintl.h.msvc-static libgnuintl.h.msvc-shared README.woe32 Makefile.msvc
20 DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \
21 COPYING.LIB-2 gettext.h libgettext.h plural-eval.c libgnuintl.h
22
23-all: all-@USE_INCLUDED_LIBINTL@
24+all:
25 all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed
26 all-no: all-no-@BUILD_INCLUDED_LIBINTL@
27 all-no-yes: libgnuintl.$la