mirror of
https://github.com/dguglielmi/sunny-overlay.git
synced 2025-12-06 18:12:39 +01:00
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From 248cc4ae060775c187667e5ce192c3a8f1aff506 Mon Sep 17 00:00:00 2001
|
|
From: Rico Tzschichholz <ricotz@ubuntu.com>
|
|
Date: Sun, 1 Sep 2019 11:11:22 +0200
|
|
Subject: =?UTF-8?q?build:=20Allow=20building=20with=20gettext=20=E2=89=A5?=
|
|
=?UTF-8?q?=200.20?=
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
The use of AM_GNU_GETTEXT_VERSION in configure.ac instructs autopoint to
|
|
copy po/Makefile.in.in from the exact gettext version. It is fine if the
|
|
version of gettext installed on the system has the same minor version
|
|
number with the requested version, but it fails if you have a newer
|
|
version of gettext because of the mismatch between autoconf macros and
|
|
Makefile.in.in.
|
|
|
|
*** error: gettext infrastructure mismatch: using a Makefile.in.in
|
|
from gettext version 0.19 but the autoconf macros are from gettext
|
|
version 0.20
|
|
|
|
Instead of specifying the exact version with AM_GNU_GETTEXT_VERSION, we
|
|
can use AM_GNU_GETTEXT_REQUIRE_VERSION to ask autopoint to simply use
|
|
the gettext version installed on the system to prevent the mismatch.
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index a5fde4f..b2aaa4a 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -61,8 +61,10 @@ GETTEXT_PACKAGE=AC_PACKAGE_NAME
|
|
AC_SUBST(GETTEXT_PACKAGE)
|
|
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used])
|
|
|
|
-AM_GNU_GETTEXT_VERSION([0.19.6])
|
|
AM_GNU_GETTEXT([external])
|
|
+# FIXME: Remove AM_GNU_GETTEXT_VERSION once autoreconf supports REQUIRE_VERSION
|
|
+AM_GNU_GETTEXT_VERSION([0.19.6])
|
|
+AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6])
|
|
|
|
LT_PREREQ([2.2.6])
|
|
LT_INIT([disable-static])
|
|
--
|
|
cgit v0.10.2
|
|
|