[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] build: Fix build with gettext 0.20.1
From: |
Jose E. Marchesi |
Subject: |
Re: [PATCH] build: Fix build with gettext 0.20.1 |
Date: |
Tue, 25 Feb 2020 09:03:17 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) |
Hi Eric.
While the gnulib libtextstyle replacement compiled fine, Fedora 31's
libtextstyle-devel from gettext 0.20.1 lacks the hyperlink support
added upstream in gettext 0.21, causing:
pk-term.c: In function 'pk_term_init':
pk-term.c:75:21: error: lvalue required as left operand of assignment
75 | style_file_name = NULL;
Hmm, even if the libtextstyle-devel library found in the system doesn't
support hyperlinks, I would expect for style_file_name to not be
replaced by gnulib.
HAVE_TEXTSTYLE_HYPERLINK_SUPPORT is used in src/pk-term.c in order to
not emit hyperlinks if the underlying implementation doesn't support
hyperlinks, but I don't think we should inhibit emitting styled output
in that case...
* src/pk-term.c (pk_term_init): Use correct conditional.
---
ChangeLog | 4 ++++
src/pk-term.c | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 65c6ee57..0257edd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2020-02-24 Eric Blake <address@hidden>
+
+ * src/pk-term.c (pk_term_init): Use correct conditional.
+
2020-02-24 Eric Blake <address@hidden>
maint: add run script for easier uninstalled usage
diff --git a/src/pk-term.c b/src/pk-term.c
index adf6c66d..833f77f0 100644
--- a/src/pk-term.c
+++ b/src/pk-term.c
@@ -58,7 +58,7 @@ pk_term_init (int argc, char *argv[])
because the textstyle.h file provided by the gnulib module
libtextstyle-optional defines style_file_name as an r-value. */
-#ifdef HAVE_LIBTEXTSTYLE
+#ifdef HAVE_TEXTSTYLE_HYPERLINK_SUPPORT
/* Open the specified style. */
if (color_mode == color_yes
|| (color_mode == color_tty