pyrox.dev
1From 467156efccc5e36a36bec8c0b64cc5a70f14d5ed Mon Sep 17 00:00:00 2001
2From: Yegor Timoshenko <yegortimoshenko@riseup.net>
3Date: Tue, 16 Jan 2018 11:43:46 +0000
4Subject: [PATCH] Fix Autoconf script
5
6gettext/intltool macros are not used correctly, see:
7https://bugs.launchpad.net/inkscape/+bug/1418943
8---
9 bootstrap | 6 +-----
10 configure.ac | 5 +----
11 2 files changed, 2 insertions(+), 9 deletions(-)
12
13diff --git a/bootstrap b/bootstrap
14index 0599cf5..40b1dca 100755
15--- a/bootstrap
16+++ b/bootstrap
17@@ -1,7 +1,3 @@
18 #!/bin/sh
19
20-# change to root directory
21-cd $(dirname "$0")
22-
23-autopoint --force && \
24- AUTOPOINT="intltoolize --automake --copy" autoreconf --force --install --verbose
25+autoreconf --force --install && intltoolize
26diff --git a/configure.ac b/configure.ac
27index be0b51a..a2e7c42 100644
28--- a/configure.ac
29+++ b/configure.ac
30@@ -17,6 +17,7 @@ AC_PROG_OBJC # For macOS support modules
31 AC_LANG([C])
32
33 AC_PROG_INTLTOOL([0.50])
34+AC_SUBST(LIBINTL)
35
36 AC_CANONICAL_HOST
37
38@@ -51,10 +52,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [
39 ])
40 AC_LANG_POP([Objective C])
41
42-# Checks for libraries.
43-AM_GNU_GETTEXT_VERSION([0.17])
44-AM_GNU_GETTEXT([external])
45-
46 GETTEXT_PACKAGE=redshift
47 AC_SUBST(GETTEXT_PACKAGE)
48 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
49--
502.15.1
51