1 |
commit: 2decb35d9c92550ed0688745039751b38dd5b916 |
2 |
Author: orbea <orbea <AT> riseup <DOT> net> |
3 |
AuthorDate: Wed Aug 31 16:28:29 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 1 02:15:51 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2decb35d |
7 |
|
8 |
app-crypt/gpa: Backport upstream autoconf fixes |
9 |
|
10 |
Bug: https://bugs.gentoo.org/844226 |
11 |
Upstream-commit: https://dev.gnupg.org/rGPAb40ff3b1f20dec3b14ca72d0af50137e38cd1808 |
12 |
Closes: https://github.com/gentoo/gentoo/pull/27083 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
app-crypt/gpa/files/gpa-0.10.0-autoconf.patch | 1111 +++++++++++++++++++++++++ |
16 |
app-crypt/gpa/gpa-0.10.0-r1.ebuild | 42 + |
17 |
2 files changed, 1153 insertions(+) |
18 |
|
19 |
diff --git a/app-crypt/gpa/files/gpa-0.10.0-autoconf.patch b/app-crypt/gpa/files/gpa-0.10.0-autoconf.patch |
20 |
new file mode 100644 |
21 |
index 000000000000..c9ff995bff9f |
22 |
--- /dev/null |
23 |
+++ b/app-crypt/gpa/files/gpa-0.10.0-autoconf.patch |
24 |
@@ -0,0 +1,1111 @@ |
25 |
+Upstream: https://dev.gnupg.org/rGPAb40ff3b1f20dec3b14ca72d0af50137e38cd1808 |
26 |
+ |
27 |
+From b40ff3b1f20dec3b14ca72d0af50137e38cd1808 Mon Sep 17 00:00:00 2001 |
28 |
+From: NIIBE Yutaka <gniibe@××××.org> |
29 |
+Date: Fri, 20 Nov 2020 12:02:53 +0900 |
30 |
+Subject: [PATCH] build: Update to newer autoconf constructs. |
31 |
+ |
32 |
+* configure.ac: Use AC_CONFIG_HEADERS instead of AM_CONFIG_HEADER. |
33 |
+Use AC_USE_SYSTEM_EXTENSIONS instead of AC_GNU_SOURCE. |
34 |
+Use AS_HELP_STRING instead of AC_HELP_STRING. |
35 |
+(AC_ISC_POSIX): Replace by AC_SEARCH_LIBS. |
36 |
+(AC_STDC_HEADERS): Replace by AC_HEADER_STDC. |
37 |
+(byte, ushort, ulong, u16, u32): Use AC_CHECK_TYPES. |
38 |
+* m4/check_zlib.m4: Use AS_HELP_STRING instead of AC_HELP_STRING. |
39 |
+Use AC_MSG_ERROR instead of AC_ERROR. |
40 |
+* m4/gettext.m4: Update from gnulib. |
41 |
+* m4/gpg-error.m4: Update from libgpg-error. |
42 |
+* m4/gpgme.m4: Update from gpgme. |
43 |
+* m4/libassuan.m4: Update from libassuan. |
44 |
+ |
45 |
+Signed-off-by: NIIBE Yutaka <gniibe@××××.org> |
46 |
+--- |
47 |
+ configure.ac | 23 +++--- |
48 |
+ m4/check_zlib.m4 | 4 +- |
49 |
+ m4/gettext.m4 | 155 ++++++++++++++++++++-------------------- |
50 |
+ m4/gpg-error.m4 | 157 ++++++++++++++++++++++++++++++++++++----- |
51 |
+ m4/gpgme.m4 | 180 +++++++++++++++++++++++++---------------------- |
52 |
+ m4/libassuan.m4 | 141 ++++++++++++++++++------------------- |
53 |
+ 6 files changed, 396 insertions(+), 264 deletions(-) |
54 |
+ |
55 |
+diff --git a/configure.ac b/configure.ac |
56 |
+index 462d573..4c1804f 100644 |
57 |
+--- a/configure.ac |
58 |
++++ b/configure.ac |
59 |
+@@ -19,7 +19,7 @@ |
60 |
+ # along with this program; if not, see <http://www.gnu.org/licenses/>. |
61 |
+ # |
62 |
+ # (Process this file with autoconf to produce a configure script.) |
63 |
+-AC_PREREQ(2.61) |
64 |
++AC_PREREQ([2.61]) |
65 |
+ min_automake_version="1.10" |
66 |
+ |
67 |
+ # The version number goes here. |
68 |
+@@ -58,7 +58,7 @@ NEED_GPGME_API=1 |
69 |
+ NEED_GPGME_VERSION=1.9.0 |
70 |
+ |
71 |
+ AC_CONFIG_AUX_DIR([build-aux]) |
72 |
+-AM_CONFIG_HEADER(config.h) |
73 |
++AC_CONFIG_HEADERS([config.h]) |
74 |
+ AC_CONFIG_SRCDIR(src/gpa.c) |
75 |
+ AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip]) |
76 |
+ |
77 |
+@@ -99,7 +99,7 @@ AC_DEFINE_UNQUOTED(BUILD_TIMESTAMP, "$BUILD_TIMESTAMP", |
78 |
+ |
79 |
+ |
80 |
+ |
81 |
+-AC_GNU_SOURCE |
82 |
++AC_USE_SYSTEM_EXTENSIONS |
83 |
+ |
84 |
+ AH_BOTTOM([ |
85 |
+ /* We don't want the old assuan codes anymore. */ |
86 |
+@@ -159,8 +159,8 @@ AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) |
87 |
+ AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) |
88 |
+ AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) |
89 |
+ AC_PROG_CC |
90 |
+-AC_ISC_POSIX |
91 |
+-AC_STDC_HEADERS |
92 |
++AC_SEARCH_LIBS([strerror],[cposix]) |
93 |
++AC_HEADER_STDC |
94 |
+ AC_PROG_RANLIB |
95 |
+ AC_CHECK_TOOL(WINDRES, windres, :) |
96 |
+ |
97 |
+@@ -171,7 +171,7 @@ AC_CHECK_TOOL(WINDRES, windres, :) |
98 |
+ card_manager=yes |
99 |
+ AC_MSG_CHECKING([whether to build the card manager]) |
100 |
+ AC_ARG_ENABLE(card-manager, |
101 |
+- AC_HELP_STRING([--disable-card-manager], |
102 |
++ AS_HELP_STRING([--disable-card-manager], |
103 |
+ [build without the card manager]), |
104 |
+ card_manager=$enableval) |
105 |
+ AC_MSG_RESULT($card_manager) |
106 |
+@@ -183,7 +183,7 @@ AM_CONDITIONAL(ENABLE_CARD_MANAGER, test "$card_manager" = yes) |
107 |
+ keyserver_support=yes |
108 |
+ AC_MSG_CHECKING([whether to include keyserver support]) |
109 |
+ AC_ARG_ENABLE(keyserver-support, |
110 |
+- AC_HELP_STRING([--disable-keyserver-support], |
111 |
++ AS_HELP_STRING([--disable-keyserver-support], |
112 |
+ [build without keyserver support]), |
113 |
+ keyserver_support=$enableval) |
114 |
+ AC_MSG_RESULT($keyserver_support) |
115 |
+@@ -313,12 +313,7 @@ AC_CHECK_HEADERS([locale.h]) |
116 |
+ # |
117 |
+ # Checks for typedefs and structures |
118 |
+ # |
119 |
+- |
120 |
+-GNUPG_CHECK_TYPEDEF(byte, HAVE_BYTE_TYPEDEF) |
121 |
+-GNUPG_CHECK_TYPEDEF(ushort, HAVE_USHORT_TYPEDEF) |
122 |
+-GNUPG_CHECK_TYPEDEF(ulong, HAVE_ULONG_TYPEDEF) |
123 |
+-GNUPG_CHECK_TYPEDEF(u16, HAVE_U16_TYPEDEF) |
124 |
+-GNUPG_CHECK_TYPEDEF(u32, HAVE_U32_TYPEDEF) |
125 |
++AC_CHECK_TYPES([byte, ushort, ulong, u16, u32]) |
126 |
+ |
127 |
+ # |
128 |
+ # Check for library functions |
129 |
+@@ -476,4 +471,4 @@ echo " |
130 |
+ |
131 |
+ Revision: mym4_revision (mym4_revision_dec) |
132 |
+ Platform: $host |
133 |
+-" |
134 |
+\ No newline at end of file |
135 |
++" |
136 |
+diff --git a/m4/check_zlib.m4 b/m4/check_zlib.m4 |
137 |
+index d5088d3..9836653 100644 |
138 |
+--- a/m4/check_zlib.m4 |
139 |
++++ b/m4/check_zlib.m4 |
140 |
+@@ -12,7 +12,7 @@ |
141 |
+ |
142 |
+ dnl zlib test |
143 |
+ AC_DEFUN([CHECK_ZLIB], [ |
144 |
+-AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib=PATH], |
145 |
++AC_ARG_WITH(zlib, AS_HELP_STRING([--with-zlib=PATH], |
146 |
+ [Look for zlib library installed in PATH/lib and headers in |
147 |
+ PATH/include rather than default include and library paths. (Use an |
148 |
+ absolute path)]), |
149 |
+@@ -22,7 +22,7 @@ absolute path)]), |
150 |
+ |
151 |
+ AC_CHECK_LIB(z, compress, |
152 |
+ LIBS="$LIBS -lz", |
153 |
+- AC_ERROR([GPA requires zlib (http://gzip.org/zlib or install Debian package zlib1g-dev)])) |
154 |
++ AC_MSG_ERROR([GPA requires zlib (https://zlib.net/ or install Debian package zlib1g-dev)])) |
155 |
+ |
156 |
+ AC_SUBST(LIBZ) |
157 |
+ ]) |
158 |
+diff --git a/m4/gettext.m4 b/m4/gettext.m4 |
159 |
+index f84e6a5..4f25a27 100644 |
160 |
+--- a/m4/gettext.m4 |
161 |
++++ b/m4/gettext.m4 |
162 |
+@@ -1,16 +1,16 @@ |
163 |
+-# gettext.m4 serial 63 (gettext-0.18) |
164 |
+-dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. |
165 |
++# gettext.m4 serial 71 (gettext-0.20.2) |
166 |
++dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc. |
167 |
+ dnl This file is free software; the Free Software Foundation |
168 |
+ dnl gives unlimited permission to copy and/or distribute it, |
169 |
+ dnl with or without modifications, as long as this notice is preserved. |
170 |
+ dnl |
171 |
+-dnl This file can can be used in projects which are not available under |
172 |
+-dnl the GNU General Public License or the GNU Library General Public |
173 |
++dnl This file can be used in projects which are not available under |
174 |
++dnl the GNU General Public License or the GNU Lesser General Public |
175 |
+ dnl License but which still want to provide support for the GNU gettext |
176 |
+ dnl functionality. |
177 |
+ dnl Please note that the actual code of the GNU gettext library is covered |
178 |
+-dnl by the GNU Library General Public License, and the rest of the GNU |
179 |
+-dnl gettext package package is covered by the GNU General Public License. |
180 |
++dnl by the GNU Lesser General Public License, and the rest of the GNU |
181 |
++dnl gettext package is covered by the GNU General Public License. |
182 |
+ dnl They are *not* in the public domain. |
183 |
+ |
184 |
+ dnl Authors: |
185 |
+@@ -20,22 +20,20 @@ dnl Bruno Haible <haible@××××××××××.org>, 2000-2006, 2008-2010. |
186 |
+ dnl Macro to add for using GNU gettext. |
187 |
+ |
188 |
+ dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). |
189 |
+-dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The |
190 |
+-dnl default (if it is not specified or empty) is 'no-libtool'. |
191 |
+-dnl INTLSYMBOL should be 'external' for packages with no intl directory, |
192 |
+-dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. |
193 |
++dnl INTLSYMBOL must be one of 'external', 'use-libtool'. |
194 |
++dnl INTLSYMBOL should be 'external' for packages other than GNU gettext, and |
195 |
++dnl 'use-libtool' for the packages 'gettext-runtime' and 'gettext-tools'. |
196 |
+ dnl If INTLSYMBOL is 'use-libtool', then a libtool library |
197 |
+ dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, |
198 |
+ dnl depending on --{enable,disable}-{shared,static} and on the presence of |
199 |
+-dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library |
200 |
+-dnl $(top_builddir)/intl/libintl.a will be created. |
201 |
++dnl AM-DISABLE-SHARED). |
202 |
+ dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext |
203 |
+ dnl implementations (in libc or libintl) without the ngettext() function |
204 |
+ dnl will be ignored. If NEEDSYMBOL is specified and is |
205 |
+ dnl 'need-formatstring-macros', then GNU gettext implementations that don't |
206 |
+ dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored. |
207 |
+ dnl INTLDIR is used to find the intl libraries. If empty, |
208 |
+-dnl the value `$(top_builddir)/intl/' is used. |
209 |
++dnl the value '$(top_builddir)/intl/' is used. |
210 |
+ dnl |
211 |
+ dnl The result of the configuration is one of three cases: |
212 |
+ dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled |
213 |
+@@ -57,19 +55,17 @@ dnl |
214 |
+ AC_DEFUN([AM_GNU_GETTEXT], |
215 |
+ [ |
216 |
+ dnl Argument checking. |
217 |
+- ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , |
218 |
++ ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [use-libtool], , |
219 |
+ [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT |
220 |
+-])])])])]) |
221 |
++])])])]) |
222 |
+ ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old], |
223 |
+- [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])]) |
224 |
++ [errprint([ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported. |
225 |
++])]) |
226 |
+ ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , |
227 |
+ [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT |
228 |
+ ])])])]) |
229 |
+ define([gt_included_intl], |
230 |
+- ifelse([$1], [external], |
231 |
+- ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]), |
232 |
+- [yes])) |
233 |
+- define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], [])) |
234 |
++ ifelse([$1], [external], [no], [yes])) |
235 |
+ gt_NEEDS_INIT |
236 |
+ AM_GNU_GETTEXT_NEED([$2]) |
237 |
+ |
238 |
+@@ -91,13 +87,12 @@ AC_DEFUN([AM_GNU_GETTEXT], |
239 |
+ dnl again, outside any 'if'. There are two solutions: |
240 |
+ dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'. |
241 |
+ dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE. |
242 |
+- dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not |
243 |
+- dnl documented, we avoid it. |
244 |
++ dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it. |
245 |
+ ifelse(gt_included_intl, yes, , [ |
246 |
+ AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY]) |
247 |
+ ]) |
248 |
+ |
249 |
+- dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation. |
250 |
++ dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation. |
251 |
+ gt_INTL_MACOSX |
252 |
+ |
253 |
+ dnl Set USE_NLS. |
254 |
+@@ -157,12 +152,23 @@ changequote([,])dnl |
255 |
+ fi |
256 |
+ |
257 |
+ AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc], |
258 |
+- [AC_TRY_LINK([#include <libintl.h> |
259 |
+-$gt_revision_test_code |
260 |
++ [AC_LINK_IFELSE( |
261 |
++ [AC_LANG_PROGRAM( |
262 |
++ [[ |
263 |
++#include <libintl.h> |
264 |
++#ifndef __GNU_GETTEXT_SUPPORTED_REVISION |
265 |
+ extern int _nl_msg_cat_cntr; |
266 |
+-extern int *_nl_domain_bindings;], |
267 |
+- [bindtextdomain ("", ""); |
268 |
+-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings], |
269 |
++extern int *_nl_domain_bindings; |
270 |
++#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings) |
271 |
++#else |
272 |
++#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 |
273 |
++#endif |
274 |
++$gt_revision_test_code |
275 |
++ ]], |
276 |
++ [[ |
277 |
++bindtextdomain ("", ""); |
278 |
++return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION |
279 |
++ ]])], |
280 |
+ [eval "$gt_func_gnugettext_libc=yes"], |
281 |
+ [eval "$gt_func_gnugettext_libc=no"])]) |
282 |
+ |
283 |
+@@ -183,35 +189,57 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_b |
284 |
+ gt_save_LIBS="$LIBS" |
285 |
+ LIBS="$LIBS $LIBINTL" |
286 |
+ dnl Now see whether libintl exists and does not depend on libiconv. |
287 |
+- AC_TRY_LINK([#include <libintl.h> |
288 |
+-$gt_revision_test_code |
289 |
++ AC_LINK_IFELSE( |
290 |
++ [AC_LANG_PROGRAM( |
291 |
++ [[ |
292 |
++#include <libintl.h> |
293 |
++#ifndef __GNU_GETTEXT_SUPPORTED_REVISION |
294 |
+ extern int _nl_msg_cat_cntr; |
295 |
+ extern |
296 |
+ #ifdef __cplusplus |
297 |
+ "C" |
298 |
+ #endif |
299 |
+-const char *_nl_expand_alias (const char *);], |
300 |
+- [bindtextdomain ("", ""); |
301 |
+-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], |
302 |
++const char *_nl_expand_alias (const char *); |
303 |
++#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) |
304 |
++#else |
305 |
++#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 |
306 |
++#endif |
307 |
++$gt_revision_test_code |
308 |
++ ]], |
309 |
++ [[ |
310 |
++bindtextdomain ("", ""); |
311 |
++return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION |
312 |
++ ]])], |
313 |
+ [eval "$gt_func_gnugettext_libintl=yes"], |
314 |
+ [eval "$gt_func_gnugettext_libintl=no"]) |
315 |
+ dnl Now see whether libintl exists and depends on libiconv. |
316 |
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then |
317 |
+ LIBS="$LIBS $LIBICONV" |
318 |
+- AC_TRY_LINK([#include <libintl.h> |
319 |
+-$gt_revision_test_code |
320 |
++ AC_LINK_IFELSE( |
321 |
++ [AC_LANG_PROGRAM( |
322 |
++ [[ |
323 |
++#include <libintl.h> |
324 |
++#ifndef __GNU_GETTEXT_SUPPORTED_REVISION |
325 |
+ extern int _nl_msg_cat_cntr; |
326 |
+ extern |
327 |
+ #ifdef __cplusplus |
328 |
+ "C" |
329 |
+ #endif |
330 |
+-const char *_nl_expand_alias (const char *);], |
331 |
+- [bindtextdomain ("", ""); |
332 |
+-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")], |
333 |
+- [LIBINTL="$LIBINTL $LIBICONV" |
334 |
+- LTLIBINTL="$LTLIBINTL $LTLIBICONV" |
335 |
+- eval "$gt_func_gnugettext_libintl=yes" |
336 |
+- ]) |
337 |
++const char *_nl_expand_alias (const char *); |
338 |
++#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias ("")) |
339 |
++#else |
340 |
++#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0 |
341 |
++#endif |
342 |
++$gt_revision_test_code |
343 |
++ ]], |
344 |
++ [[ |
345 |
++bindtextdomain ("", ""); |
346 |
++return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION |
347 |
++ ]])], |
348 |
++ [LIBINTL="$LIBINTL $LIBICONV" |
349 |
++ LTLIBINTL="$LTLIBINTL $LTLIBICONV" |
350 |
++ eval "$gt_func_gnugettext_libintl=yes" |
351 |
++ ]) |
352 |
+ fi |
353 |
+ CPPFLAGS="$gt_save_CPPFLAGS" |
354 |
+ LIBS="$gt_save_LIBS"]) |
355 |
+@@ -245,8 +273,8 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a |
356 |
+ dnl Mark actions used to generate GNU NLS library. |
357 |
+ BUILD_INCLUDED_LIBINTL=yes |
358 |
+ USE_INCLUDED_LIBINTL=yes |
359 |
+- LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD" |
360 |
+- LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD" |
361 |
++ LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD" |
362 |
++ LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD" |
363 |
+ LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` |
364 |
+ fi |
365 |
+ |
366 |
+@@ -314,43 +342,14 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a |
367 |
+ fi |
368 |
+ |
369 |
+ ifelse(gt_included_intl, yes, [ |
370 |
+- dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL |
371 |
+- dnl to 'yes' because some of the testsuite requires it. |
372 |
+- if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then |
373 |
+- BUILD_INCLUDED_LIBINTL=yes |
374 |
+- fi |
375 |
++ dnl In GNU gettext we have to set BUILD_INCLUDED_LIBINTL to 'yes' |
376 |
++ dnl because some of the testsuite requires it. |
377 |
++ BUILD_INCLUDED_LIBINTL=yes |
378 |
+ |
379 |
+ dnl Make all variables we use known to autoconf. |
380 |
+ AC_SUBST([BUILD_INCLUDED_LIBINTL]) |
381 |
+ AC_SUBST([USE_INCLUDED_LIBINTL]) |
382 |
+ AC_SUBST([CATOBJEXT]) |
383 |
+- |
384 |
+- dnl For backward compatibility. Some configure.ins may be using this. |
385 |
+- nls_cv_header_intl= |
386 |
+- nls_cv_header_libgt= |
387 |
+- |
388 |
+- dnl For backward compatibility. Some Makefiles may be using this. |
389 |
+- DATADIRNAME=share |
390 |
+- AC_SUBST([DATADIRNAME]) |
391 |
+- |
392 |
+- dnl For backward compatibility. Some Makefiles may be using this. |
393 |
+- INSTOBJEXT=.mo |
394 |
+- AC_SUBST([INSTOBJEXT]) |
395 |
+- |
396 |
+- dnl For backward compatibility. Some Makefiles may be using this. |
397 |
+- GENCAT=gencat |
398 |
+- AC_SUBST([GENCAT]) |
399 |
+- |
400 |
+- dnl For backward compatibility. Some Makefiles may be using this. |
401 |
+- INTLOBJS= |
402 |
+- if test "$USE_INCLUDED_LIBINTL" = yes; then |
403 |
+- INTLOBJS="\$(GETTOBJS)" |
404 |
+- fi |
405 |
+- AC_SUBST([INTLOBJS]) |
406 |
+- |
407 |
+- dnl Enable libtool support if the surrounding package wishes it. |
408 |
+- INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix |
409 |
+- AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX]) |
410 |
+ ]) |
411 |
+ |
412 |
+ dnl For backward compatibility. Some Makefiles may be using this. |
413 |
+@@ -381,3 +380,7 @@ AC_DEFUN([AM_GNU_GETTEXT_NEED], |
414 |
+ |
415 |
+ dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) |
416 |
+ AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) |
417 |
++ |
418 |
++ |
419 |
++dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version]) |
420 |
++AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], []) |
421 |
+diff --git a/m4/gpg-error.m4 b/m4/gpg-error.m4 |
422 |
+index 9d96d16..c9b235f 100644 |
423 |
+--- a/m4/gpg-error.m4 |
424 |
++++ b/m4/gpg-error.m4 |
425 |
+@@ -1,5 +1,5 @@ |
426 |
+ # gpg-error.m4 - autoconf macro to detect libgpg-error. |
427 |
+-# Copyright (C) 2002, 2003, 2004 g10 Code GmbH |
428 |
++# Copyright (C) 2002, 2003, 2004, 2011, 2014, 2018, 2020 g10 Code GmbH |
429 |
+ # |
430 |
+ # This file is free software; as a special exception the author gives |
431 |
+ # unlimited permission to copy and/or distribute it, with or without |
432 |
+@@ -8,58 +8,181 @@ |
433 |
+ # This file is distributed in the hope that it will be useful, but |
434 |
+ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the |
435 |
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
436 |
++# |
437 |
++# Last-changed: 2020-11-17 |
438 |
++ |
439 |
+ |
440 |
+ dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION, |
441 |
+ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) |
442 |
+-dnl Test for libgpg-error and define GPG_ERROR_CFLAGS and GPG_ERROR_LIBS |
443 |
++dnl |
444 |
++dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS, |
445 |
++dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS. The _MT_ variants are |
446 |
++dnl used for programs requireing real multi thread support. |
447 |
++dnl |
448 |
++dnl If a prefix option is not used, the config script is first |
449 |
++dnl searched in $SYSROOT/bin and then along $PATH. If the used |
450 |
++dnl config script does not match the host specification the script |
451 |
++dnl is added to the gpg_config_script_warn variable. |
452 |
+ dnl |
453 |
+ AC_DEFUN([AM_PATH_GPG_ERROR], |
454 |
+-[ AC_ARG_WITH(gpg-error-prefix, |
455 |
+- AC_HELP_STRING([--with-gpg-error-prefix=PFX], |
456 |
+- [prefix where GPG Error is installed (optional)]), |
457 |
+- gpg_error_config_prefix="$withval", gpg_error_config_prefix="") |
458 |
+- if test x$gpg_error_config_prefix != x ; then |
459 |
+- if test x${GPG_ERROR_CONFIG+set} != xset ; then |
460 |
+- GPG_ERROR_CONFIG=$gpg_error_config_prefix/bin/gpg-error-config |
461 |
++[ AC_REQUIRE([AC_CANONICAL_HOST]) |
462 |
++ gpg_error_config_prefix="" |
463 |
++ dnl --with-libgpg-error-prefix=PFX is the preferred name for this option, |
464 |
++ dnl since that is consistent with how our three siblings use the directory/ |
465 |
++ dnl package name in --with-$dir_name-prefix=PFX. |
466 |
++ AC_ARG_WITH(libgpg-error-prefix, |
467 |
++ AS_HELP_STRING([--with-libgpg-error-prefix=PFX], |
468 |
++ [prefix where GPG Error is installed (optional)]), |
469 |
++ [gpg_error_config_prefix="$withval"]) |
470 |
++ |
471 |
++ dnl Accept --with-gpg-error-prefix and make it work the same as |
472 |
++ dnl --with-libgpg-error-prefix above, for backwards compatibility, |
473 |
++ dnl but do not document this old, inconsistently-named option. |
474 |
++ AC_ARG_WITH(gpg-error-prefix,, |
475 |
++ [gpg_error_config_prefix="$withval"]) |
476 |
++ |
477 |
++ if test x"${GPG_ERROR_CONFIG}" = x ; then |
478 |
++ if test x"${gpg_error_config_prefix}" != x ; then |
479 |
++ GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config" |
480 |
++ else |
481 |
++ case "${SYSROOT}" in |
482 |
++ /*) |
483 |
++ if test -x "${SYSROOT}/bin/gpg-error-config" ; then |
484 |
++ GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config" |
485 |
++ fi |
486 |
++ ;; |
487 |
++ '') |
488 |
++ ;; |
489 |
++ *) |
490 |
++ AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) |
491 |
++ ;; |
492 |
++ esac |
493 |
+ fi |
494 |
+ fi |
495 |
+ |
496 |
+ AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) |
497 |
+- min_gpg_error_version=ifelse([$1], ,0.0,$1) |
498 |
+- AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) |
499 |
++ min_gpg_error_version=ifelse([$1], ,1.33,$1) |
500 |
+ ok=no |
501 |
+- if test "$GPG_ERROR_CONFIG" != "no" ; then |
502 |
++ |
503 |
++ if test "$prefix" = NONE ; then |
504 |
++ prefix_option_expanded=/usr/local |
505 |
++ else |
506 |
++ prefix_option_expanded="$prefix" |
507 |
++ fi |
508 |
++ if test "$exec_prefix" = NONE ; then |
509 |
++ exec_prefix_option_expanded=$prefix_option_expanded |
510 |
++ else |
511 |
++ exec_prefix_option_expanded=$(prefix=$prefix_option_expanded eval echo $exec_prefix) |
512 |
++ fi |
513 |
++ libdir_option_expanded=$(prefix=$prefix_option_expanded exec_prefix=$exec_prefix_option_expanded eval echo $libdir) |
514 |
++ |
515 |
++ if test -f $libdir_option_expanded/pkgconfig/gpg-error.pc; then |
516 |
++ gpgrt_libdir=$libdir_option_expanded |
517 |
++ else |
518 |
++ if crt1_path=$(${CC:-cc} -print-file-name=crt1.o 2>/dev/null); then |
519 |
++ if possible_libdir=$(cd ${crt1_path%/*} && pwd 2>/dev/null); then |
520 |
++ if test -f $possible_libdir/pkgconfig/gpg-error.pc; then |
521 |
++ gpgrt_libdir=$possible_libdir |
522 |
++ fi |
523 |
++ fi |
524 |
++ fi |
525 |
++ fi |
526 |
++ |
527 |
++ if test "$GPG_ERROR_CONFIG" = "no" -a -n "$gpgrt_libdir"; then |
528 |
++ AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) |
529 |
++ if test "$GPGRT_CONFIG" = "no"; then |
530 |
++ unset GPGRT_CONFIG |
531 |
++ else |
532 |
++ GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" |
533 |
++ if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then |
534 |
++ GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" |
535 |
++ AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) |
536 |
++ gpg_error_config_version=`$GPG_ERROR_CONFIG --modversion` |
537 |
++ else |
538 |
++ unset GPGRT_CONFIG |
539 |
++ fi |
540 |
++ fi |
541 |
++ else |
542 |
++ gpg_error_config_version=`$GPG_ERROR_CONFIG --version` |
543 |
++ fi |
544 |
++ if test "$GPG_ERROR_CONFIG" != "no"; then |
545 |
+ req_major=`echo $min_gpg_error_version | \ |
546 |
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` |
547 |
+ req_minor=`echo $min_gpg_error_version | \ |
548 |
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` |
549 |
+- gpg_error_config_version=`$GPG_ERROR_CONFIG $gpg_error_config_args --version` |
550 |
+ major=`echo $gpg_error_config_version | \ |
551 |
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` |
552 |
+ minor=`echo $gpg_error_config_version | \ |
553 |
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` |
554 |
+ if test "$major" -gt "$req_major"; then |
555 |
+ ok=yes |
556 |
+- else |
557 |
++ else |
558 |
+ if test "$major" -eq "$req_major"; then |
559 |
+ if test "$minor" -ge "$req_minor"; then |
560 |
+ ok=yes |
561 |
+ fi |
562 |
+ fi |
563 |
+ fi |
564 |
++ if test -z "$GPGRT_CONFIG" -a -n "$gpgrt_libdir"; then |
565 |
++ if test "$major" -gt 1 -o "$major" -eq 1 -a "$minor" -ge 33; then |
566 |
++ AC_PATH_PROG(GPGRT_CONFIG, gpgrt-config, no) |
567 |
++ if test "$GPGRT_CONFIG" = "no"; then |
568 |
++ unset GPGRT_CONFIG |
569 |
++ else |
570 |
++ GPGRT_CONFIG="$GPGRT_CONFIG --libdir=$gpgrt_libdir" |
571 |
++ if $GPGRT_CONFIG gpg-error >/dev/null 2>&1; then |
572 |
++ GPG_ERROR_CONFIG="$GPGRT_CONFIG gpg-error" |
573 |
++ AC_MSG_NOTICE([Use gpgrt-config with $gpgrt_libdir as gpg-error-config]) |
574 |
++ else |
575 |
++ unset GPGRT_CONFIG |
576 |
++ fi |
577 |
++ fi |
578 |
++ fi |
579 |
++ fi |
580 |
+ fi |
581 |
++ AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) |
582 |
+ if test $ok = yes; then |
583 |
+- GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags` |
584 |
+- GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs` |
585 |
++ GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG --cflags` |
586 |
++ GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG --libs` |
587 |
++ if test -z "$GPGRT_CONFIG"; then |
588 |
++ GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --mt --cflags 2>/dev/null` |
589 |
++ GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --mt --libs 2>/dev/null` |
590 |
++ else |
591 |
++ GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG --variable=mtcflags 2>/dev/null` |
592 |
++ GPG_ERROR_MT_CFLAGS="$GPG_ERROR_CFLAGS${GPG_ERROR_CFLAGS:+ }$GPG_ERROR_MT_CFLAGS" |
593 |
++ GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG --variable=mtlibs 2>/dev/null` |
594 |
++ GPG_ERROR_MT_LIBS="$GPG_ERROR_LIBS${GPG_ERROR_LIBS:+ }$GPG_ERROR_MT_LIBS" |
595 |
++ fi |
596 |
+ AC_MSG_RESULT([yes ($gpg_error_config_version)]) |
597 |
+ ifelse([$2], , :, [$2]) |
598 |
++ if test -z "$GPGRT_CONFIG"; then |
599 |
++ gpg_error_config_host=`$GPG_ERROR_CONFIG --host 2>/dev/null || echo none` |
600 |
++ else |
601 |
++ gpg_error_config_host=`$GPG_ERROR_CONFIG --variable=host 2>/dev/null || echo none` |
602 |
++ fi |
603 |
++ if test x"$gpg_error_config_host" != xnone ; then |
604 |
++ if test x"$gpg_error_config_host" != x"$host" ; then |
605 |
++ AC_MSG_WARN([[ |
606 |
++*** |
607 |
++*** The config script "$GPG_ERROR_CONFIG" was |
608 |
++*** built for $gpg_error_config_host and thus may not match the |
609 |
++*** used host $host. |
610 |
++*** You may want to use the configure option --with-libgpg-error-prefix |
611 |
++*** to specify a matching config script or use \$SYSROOT. |
612 |
++***]]) |
613 |
++ gpg_config_script_warn="$gpg_config_script_warn libgpg-error" |
614 |
++ fi |
615 |
++ fi |
616 |
+ else |
617 |
+ GPG_ERROR_CFLAGS="" |
618 |
+ GPG_ERROR_LIBS="" |
619 |
++ GPG_ERROR_MT_CFLAGS="" |
620 |
++ GPG_ERROR_MT_LIBS="" |
621 |
+ AC_MSG_RESULT(no) |
622 |
+ ifelse([$3], , :, [$3]) |
623 |
+ fi |
624 |
+ AC_SUBST(GPG_ERROR_CFLAGS) |
625 |
+ AC_SUBST(GPG_ERROR_LIBS) |
626 |
++ AC_SUBST(GPG_ERROR_MT_CFLAGS) |
627 |
++ AC_SUBST(GPG_ERROR_MT_LIBS) |
628 |
+ ]) |
629 |
+- |
630 |
+diff --git a/m4/gpgme.m4 b/m4/gpgme.m4 |
631 |
+index 44bf43c..c749a5d 100644 |
632 |
+--- a/m4/gpgme.m4 |
633 |
++++ b/m4/gpgme.m4 |
634 |
+@@ -1,5 +1,5 @@ |
635 |
+ # gpgme.m4 - autoconf macro to detect GPGME. |
636 |
+-# Copyright (C) 2002, 2003, 2004 g10 Code GmbH |
637 |
++# Copyright (C) 2002, 2003, 2004, 2014, 2018 g10 Code GmbH |
638 |
+ # |
639 |
+ # This file is free software; as a special exception the author gives |
640 |
+ # unlimited permission to copy and/or distribute it, with or without |
641 |
+@@ -8,20 +8,52 @@ |
642 |
+ # This file is distributed in the hope that it will be useful, but |
643 |
+ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the |
644 |
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
645 |
++# |
646 |
++# Last-changed: 2020-11-20 |
647 |
+ |
648 |
+ |
649 |
+ AC_DEFUN([_AM_PATH_GPGME_CONFIG], |
650 |
+ [ AC_ARG_WITH(gpgme-prefix, |
651 |
+- AC_HELP_STRING([--with-gpgme-prefix=PFX], |
652 |
++ AS_HELP_STRING([--with-gpgme-prefix=PFX], |
653 |
+ [prefix where GPGME is installed (optional)]), |
654 |
+ gpgme_config_prefix="$withval", gpgme_config_prefix="") |
655 |
+- if test "x$gpgme_config_prefix" != x ; then |
656 |
+- GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config" |
657 |
++ if test x"${GPGME_CONFIG}" = x ; then |
658 |
++ if test x"${gpgme_config_prefix}" != x ; then |
659 |
++ GPGME_CONFIG="${gpgme_config_prefix}/bin/gpgme-config" |
660 |
++ else |
661 |
++ case "${SYSROOT}" in |
662 |
++ /*) |
663 |
++ if test -x "${SYSROOT}/bin/gpgme-config" ; then |
664 |
++ GPGME_CONFIG="${SYSROOT}/bin/gpgme-config" |
665 |
++ fi |
666 |
++ ;; |
667 |
++ '') |
668 |
++ ;; |
669 |
++ *) |
670 |
++ AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) |
671 |
++ ;; |
672 |
++ esac |
673 |
++ fi |
674 |
++ fi |
675 |
++ |
676 |
++ use_gpgrt_config="" |
677 |
++ if test x"${GPGME_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then |
678 |
++ if $GPGRT_CONFIG gpgme --exists; then |
679 |
++ GPGME_CONFIG="$GPGRT_CONFIG gpgme" |
680 |
++ AC_MSG_NOTICE([Use gpgrt-config as gpgme-config]) |
681 |
++ use_gpgrt_config=yes |
682 |
++ fi |
683 |
++ fi |
684 |
++ if test -z "$use_gpgrt_config"; then |
685 |
++ AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no) |
686 |
+ fi |
687 |
+- AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no) |
688 |
+ |
689 |
+ if test "$GPGME_CONFIG" != "no" ; then |
690 |
+- gpgme_version=`$GPGME_CONFIG --version` |
691 |
++ if test -z "$use_gpgrt_config"; then |
692 |
++ gpgme_version=`$GPGME_CONFIG --version` |
693 |
++ else |
694 |
++ gpgme_version=`$GPGME_CONFIG --modversion` |
695 |
++ fi |
696 |
+ fi |
697 |
+ gpgme_version_major=`echo $gpgme_version | \ |
698 |
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` |
699 |
+@@ -31,10 +63,39 @@ AC_DEFUN([_AM_PATH_GPGME_CONFIG], |
700 |
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` |
701 |
+ ]) |
702 |
+ |
703 |
++ |
704 |
++AC_DEFUN([_AM_PATH_GPGME_CONFIG_HOST_CHECK], |
705 |
++[ |
706 |
++ if test -z "$use_gpgrt_config"; then |
707 |
++ gpgme_config_host=`$GPGME_CONFIG --host 2>/dev/null || echo none` |
708 |
++ else |
709 |
++ gpgme_config_host=`$GPGME_CONFIG --variable=host 2>/dev/null || echo none` |
710 |
++ fi |
711 |
++ if test x"$gpgme_config_host" != xnone ; then |
712 |
++ if test x"$gpgme_config_host" != x"$host" ; then |
713 |
++ AC_MSG_WARN([[ |
714 |
++*** |
715 |
++*** The config script "$GPGME_CONFIG" was |
716 |
++*** built for $gpgme_config_host and thus may not match the |
717 |
++*** used host $host. |
718 |
++*** You may want to use the configure option --with-gpgme-prefix |
719 |
++*** to specify a matching config script or use \$SYSROOT. |
720 |
++***]]) |
721 |
++ gpg_config_script_warn="$gpg_config_script_warn gpgme" |
722 |
++ fi |
723 |
++ fi |
724 |
++]) |
725 |
++ |
726 |
++ |
727 |
+ dnl AM_PATH_GPGME([MINIMUM-VERSION, |
728 |
+ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) |
729 |
+ dnl Test for libgpgme and define GPGME_CFLAGS and GPGME_LIBS. |
730 |
+ dnl |
731 |
++dnl If a prefix option is not used, the config script is first |
732 |
++dnl searched in $SYSROOT/bin and then along $PATH. If the used |
733 |
++dnl config script does not match the host specification the script |
734 |
++dnl is added to the gpg_config_script_warn variable. |
735 |
++dnl |
736 |
+ AC_DEFUN([AM_PATH_GPGME], |
737 |
+ [ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl |
738 |
+ tmp=ifelse([$1], ,1:0.4.2,$1) |
739 |
+@@ -57,7 +118,7 @@ AC_DEFUN([AM_PATH_GPGME], |
740 |
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` |
741 |
+ if test "$gpgme_version_major" -gt "$req_major"; then |
742 |
+ ok=yes |
743 |
+- else |
744 |
++ else |
745 |
+ if test "$gpgme_version_major" -eq "$req_major"; then |
746 |
+ if test "$gpgme_version_minor" -gt "$req_minor"; then |
747 |
+ ok=yes |
748 |
+@@ -75,7 +136,11 @@ AC_DEFUN([AM_PATH_GPGME], |
749 |
+ # If we have a recent GPGME, we should also check that the |
750 |
+ # API is compatible. |
751 |
+ if test "$req_gpgme_api" -gt 0 ; then |
752 |
+- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` |
753 |
++ if test -z "$use_gpgrt_config"; then |
754 |
++ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` |
755 |
++ else |
756 |
++ tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0` |
757 |
++ fi |
758 |
+ if test "$tmp" -gt 0 ; then |
759 |
+ if test "$req_gpgme_api" -ne "$tmp" ; then |
760 |
+ ok=no |
761 |
+@@ -88,6 +153,7 @@ AC_DEFUN([AM_PATH_GPGME], |
762 |
+ GPGME_LIBS=`$GPGME_CONFIG --libs` |
763 |
+ AC_MSG_RESULT(yes) |
764 |
+ ifelse([$2], , :, [$2]) |
765 |
++ _AM_PATH_GPGME_CONFIG_HOST_CHECK |
766 |
+ else |
767 |
+ GPGME_CFLAGS="" |
768 |
+ GPGME_LIBS="" |
769 |
+@@ -98,75 +164,6 @@ AC_DEFUN([AM_PATH_GPGME], |
770 |
+ AC_SUBST(GPGME_LIBS) |
771 |
+ ]) |
772 |
+ |
773 |
+-dnl AM_PATH_GPGME_PTH([MINIMUM-VERSION, |
774 |
+-dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) |
775 |
+-dnl Test for libgpgme and define GPGME_PTH_CFLAGS and GPGME_PTH_LIBS. |
776 |
+-dnl |
777 |
+-AC_DEFUN([AM_PATH_GPGME_PTH], |
778 |
+-[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl |
779 |
+- tmp=ifelse([$1], ,1:0.4.2,$1) |
780 |
+- if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then |
781 |
+- req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` |
782 |
+- min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` |
783 |
+- else |
784 |
+- req_gpgme_api=0 |
785 |
+- min_gpgme_version="$tmp" |
786 |
+- fi |
787 |
+- |
788 |
+- AC_MSG_CHECKING(for GPGME Pth - version >= $min_gpgme_version) |
789 |
+- ok=no |
790 |
+- if test "$GPGME_CONFIG" != "no" ; then |
791 |
+- if `$GPGME_CONFIG --thread=pth 2> /dev/null` ; then |
792 |
+- req_major=`echo $min_gpgme_version | \ |
793 |
+- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` |
794 |
+- req_minor=`echo $min_gpgme_version | \ |
795 |
+- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` |
796 |
+- req_micro=`echo $min_gpgme_version | \ |
797 |
+- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` |
798 |
+- if test "$gpgme_version_major" -gt "$req_major"; then |
799 |
+- ok=yes |
800 |
+- else |
801 |
+- if test "$gpgme_version_major" -eq "$req_major"; then |
802 |
+- if test "$gpgme_version_minor" -gt "$req_minor"; then |
803 |
+- ok=yes |
804 |
+- else |
805 |
+- if test "$gpgme_version_minor" -eq "$req_minor"; then |
806 |
+- if test "$gpgme_version_micro" -ge "$req_micro"; then |
807 |
+- ok=yes |
808 |
+- fi |
809 |
+- fi |
810 |
+- fi |
811 |
+- fi |
812 |
+- fi |
813 |
+- fi |
814 |
+- fi |
815 |
+- if test $ok = yes; then |
816 |
+- # If we have a recent GPGME, we should also check that the |
817 |
+- # API is compatible. |
818 |
+- if test "$req_gpgme_api" -gt 0 ; then |
819 |
+- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` |
820 |
+- if test "$tmp" -gt 0 ; then |
821 |
+- if test "$req_gpgme_api" -ne "$tmp" ; then |
822 |
+- ok=no |
823 |
+- fi |
824 |
+- fi |
825 |
+- fi |
826 |
+- fi |
827 |
+- if test $ok = yes; then |
828 |
+- GPGME_PTH_CFLAGS=`$GPGME_CONFIG --thread=pth --cflags` |
829 |
+- GPGME_PTH_LIBS=`$GPGME_CONFIG --thread=pth --libs` |
830 |
+- AC_MSG_RESULT(yes) |
831 |
+- ifelse([$2], , :, [$2]) |
832 |
+- else |
833 |
+- GPGME_PTH_CFLAGS="" |
834 |
+- GPGME_PTH_LIBS="" |
835 |
+- AC_MSG_RESULT(no) |
836 |
+- ifelse([$3], , :, [$3]) |
837 |
+- fi |
838 |
+- AC_SUBST(GPGME_PTH_CFLAGS) |
839 |
+- AC_SUBST(GPGME_PTH_LIBS) |
840 |
+-]) |
841 |
+- |
842 |
+ dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION, |
843 |
+ dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) |
844 |
+ dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS |
845 |
+@@ -195,7 +192,7 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD], |
846 |
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` |
847 |
+ if test "$gpgme_version_major" -gt "$req_major"; then |
848 |
+ ok=yes |
849 |
+- else |
850 |
++ else |
851 |
+ if test "$gpgme_version_major" -eq "$req_major"; then |
852 |
+ if test "$gpgme_version_minor" -gt "$req_minor"; then |
853 |
+ ok=yes |
854 |
+@@ -227,6 +224,7 @@ AC_DEFUN([AM_PATH_GPGME_PTHREAD], |
855 |
+ GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs` |
856 |
+ AC_MSG_RESULT(yes) |
857 |
+ ifelse([$2], , :, [$2]) |
858 |
++ _AM_PATH_GPGME_CONFIG_HOST_CHECK |
859 |
+ else |
860 |
+ GPGME_PTHREAD_CFLAGS="" |
861 |
+ GPGME_PTHREAD_LIBS="" |
862 |
+@@ -264,7 +262,7 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], |
863 |
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` |
864 |
+ if test "$gpgme_version_major" -gt "$req_major"; then |
865 |
+ ok=yes |
866 |
+- else |
867 |
++ else |
868 |
+ if test "$gpgme_version_major" -eq "$req_major"; then |
869 |
+ if test "$gpgme_version_minor" -gt "$req_minor"; then |
870 |
+ ok=yes |
871 |
+@@ -282,7 +280,11 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], |
872 |
+ # If we have a recent GPGME, we should also check that the |
873 |
+ # API is compatible. |
874 |
+ if test "$req_gpgme_api" -gt 0 ; then |
875 |
+- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` |
876 |
++ if test -z "$use_gpgrt_config"; then |
877 |
++ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` |
878 |
++ else |
879 |
++ tmp=`$GPGME_CONFIG --variable=api_version 2>/dev/null || echo 0` |
880 |
++ fi |
881 |
+ if test "$tmp" -gt 0 ; then |
882 |
+ if test "$req_gpgme_api" -ne "$tmp" ; then |
883 |
+ ok=no |
884 |
+@@ -291,10 +293,23 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], |
885 |
+ fi |
886 |
+ fi |
887 |
+ if test $ok = yes; then |
888 |
+- GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags` |
889 |
+- GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs` |
890 |
++ if test -z "$use_gpgrt_config"; then |
891 |
++ GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags` |
892 |
++ GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs` |
893 |
++ else |
894 |
++ if $GPGRT_CONFIG gpgme-glib --exists; then |
895 |
++ GPGME_CONFIG="$GPGRT_CONFIG gpgme-glib" |
896 |
++ GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --cflags` |
897 |
++ GPGME_GLIB_LIBS=`$GPGME_CONFIG --libs` |
898 |
++ else |
899 |
++ ok = no |
900 |
++ fi |
901 |
++ fi |
902 |
++ fi |
903 |
++ if test $ok = yes; then |
904 |
+ AC_MSG_RESULT(yes) |
905 |
+ ifelse([$2], , :, [$2]) |
906 |
++ _AM_PATH_GPGME_CONFIG_HOST_CHECK |
907 |
+ else |
908 |
+ GPGME_GLIB_CFLAGS="" |
909 |
+ GPGME_GLIB_LIBS="" |
910 |
+@@ -304,4 +319,3 @@ AC_DEFUN([AM_PATH_GPGME_GLIB], |
911 |
+ AC_SUBST(GPGME_GLIB_CFLAGS) |
912 |
+ AC_SUBST(GPGME_GLIB_LIBS) |
913 |
+ ]) |
914 |
+- |
915 |
+diff --git a/m4/libassuan.m4 b/m4/libassuan.m4 |
916 |
+index 004eee3..df50484 100644 |
917 |
+--- a/m4/libassuan.m4 |
918 |
++++ b/m4/libassuan.m4 |
919 |
+@@ -1,5 +1,5 @@ |
920 |
+ dnl Autoconf macros for libassuan |
921 |
+-dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc. |
922 |
++dnl Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc. |
923 |
+ dnl |
924 |
+ dnl This file is free software; as a special exception the author gives |
925 |
+ dnl unlimited permission to copy and/or distribute it, with or without |
926 |
+@@ -8,23 +8,36 @@ dnl |
927 |
+ dnl This file is distributed in the hope that it will be useful, but |
928 |
+ dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the |
929 |
+ dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
930 |
++dnl SPDX-License-Identifier: FSFULLR |
931 |
++# Last-changed: 2020-11-17 |
932 |
+ |
933 |
+ dnl |
934 |
+ dnl Common code used for libassuan detection [internal] |
935 |
+ dnl Returns ok set to yes or no. |
936 |
+ dnl |
937 |
+ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], |
938 |
+-[ AC_ARG_WITH(libassuan-prefix, |
939 |
+- AC_HELP_STRING([--with-libassuan-prefix=PFX], |
940 |
++[ AC_REQUIRE([AC_CANONICAL_HOST]) |
941 |
++ AC_ARG_WITH(libassuan-prefix, |
942 |
++ AS_HELP_STRING([--with-libassuan-prefix=PFX], |
943 |
+ [prefix where LIBASSUAN is installed (optional)]), |
944 |
+ libassuan_config_prefix="$withval", libassuan_config_prefix="") |
945 |
+ if test x$libassuan_config_prefix != x ; then |
946 |
+- libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix" |
947 |
+ if test x${LIBASSUAN_CONFIG+set} != xset ; then |
948 |
+ LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config |
949 |
+ fi |
950 |
+ fi |
951 |
+- AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no) |
952 |
++ |
953 |
++ use_gpgrt_config="" |
954 |
++ if test x"${LIBASSUAN_CONFIG}" = x -a x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then |
955 |
++ if $GPGRT_CONFIG libassuan --exists; then |
956 |
++ LIBASSUAN_CONFIG="$GPGRT_CONFIG libassuan" |
957 |
++ AC_MSG_NOTICE([Use gpgrt-config as libassuan-config]) |
958 |
++ use_gpgrt_config=yes |
959 |
++ fi |
960 |
++ fi |
961 |
++ if test -z "$use_gpgrt_config"; then |
962 |
++ AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no) |
963 |
++ fi |
964 |
+ |
965 |
+ tmp=ifelse([$1], ,1:0.9.2,$1) |
966 |
+ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then |
967 |
+@@ -35,55 +48,60 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], |
968 |
+ min_libassuan_version="$tmp" |
969 |
+ fi |
970 |
+ |
971 |
+- if test "$LIBASSUAN_CONFIG" != "no" ; then |
972 |
+- libassuan_version=`$LIBASSUAN_CONFIG --version` |
973 |
+- fi |
974 |
+- libassuan_version_major=`echo $libassuan_version | \ |
975 |
+- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` |
976 |
+- libassuan_version_minor=`echo $libassuan_version | \ |
977 |
+- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` |
978 |
+- libassuan_version_micro=`echo $libassuan_version | \ |
979 |
+- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` |
980 |
+- |
981 |
+- AC_MSG_CHECKING(for LIBASSUAN ifelse([$2], ,,[$2 ])- version >= $min_libassuan_version) |
982 |
++ AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version) |
983 |
+ ok=no |
984 |
+- if test "$LIBASSUAN_CONFIG" != "no" ; then |
985 |
+- ifelse([$2], ,,[if `$LIBASSUAN_CONFIG --thread=$2 2> /dev/null` ; then]) |
986 |
++ if test "$LIBASSUAN_CONFIG" != "no"; then |
987 |
+ req_major=`echo $min_libassuan_version | \ |
988 |
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` |
989 |
+ req_minor=`echo $min_libassuan_version | \ |
990 |
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` |
991 |
+ req_micro=`echo $min_libassuan_version | \ |
992 |
+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` |
993 |
+- if test "$libassuan_version_major" -gt "$req_major"; then |
994 |
++ |
995 |
++ if test -z "$use_gpgrt_config"; then |
996 |
++ libassuan_config_version=`$LIBASSUAN_CONFIG --version` |
997 |
++ else |
998 |
++ libassuan_config_version=`$LIBASSUAN_CONFIG --modversion` |
999 |
++ fi |
1000 |
++ major=`echo $libassuan_config_version | \ |
1001 |
++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` |
1002 |
++ minor=`echo $libassuan_config_version | \ |
1003 |
++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` |
1004 |
++ micro=`echo $libassuan_config_version | \ |
1005 |
++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` |
1006 |
++ |
1007 |
++ if test "$major" -gt "$req_major"; then |
1008 |
+ ok=yes |
1009 |
+- else |
1010 |
+- if test "$libassuan_version_major" -eq "$req_major"; then |
1011 |
+- if test "$libassuan_version_minor" -gt "$req_minor"; then |
1012 |
++ else |
1013 |
++ if test "$major" -eq "$req_major"; then |
1014 |
++ if test "$minor" -gt "$req_minor"; then |
1015 |
+ ok=yes |
1016 |
+ else |
1017 |
+- if test "$libassuan_version_minor" -eq "$req_minor"; then |
1018 |
+- if test "$libassuan_version_micro" -ge "$req_micro"; then |
1019 |
++ if test "$minor" -eq "$req_minor"; then |
1020 |
++ if test "$micro" -ge "$req_micro"; then |
1021 |
+ ok=yes |
1022 |
+ fi |
1023 |
+ fi |
1024 |
+ fi |
1025 |
+ fi |
1026 |
+ fi |
1027 |
+- ifelse([$2], ,,[fi]) |
1028 |
+ fi |
1029 |
+ |
1030 |
+ if test $ok = yes; then |
1031 |
+- AC_MSG_RESULT([yes ($libassuan_version)]) |
1032 |
++ AC_MSG_RESULT([yes ($libassuan_config_version)]) |
1033 |
+ else |
1034 |
+ AC_MSG_RESULT(no) |
1035 |
+ fi |
1036 |
+ |
1037 |
+ if test $ok = yes; then |
1038 |
+ if test "$req_libassuan_api" -gt 0 ; then |
1039 |
+- tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0` |
1040 |
++ if test -z "$use_gpgrt_config"; then |
1041 |
++ tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0` |
1042 |
++ else |
1043 |
++ tmp=`$LIBASSUAN_CONFIG --variable=api_version 2>/dev/null || echo 0` |
1044 |
++ fi |
1045 |
+ if test "$tmp" -gt 0 ; then |
1046 |
+- AC_MSG_CHECKING([LIBASSUAN ifelse([$2], ,,[$2 ])API version]) |
1047 |
++ AC_MSG_CHECKING([LIBASSUAN API version]) |
1048 |
+ if test "$req_libassuan_api" -eq "$tmp" ; then |
1049 |
+ AC_MSG_RESULT(okay) |
1050 |
+ else |
1051 |
+@@ -94,6 +112,27 @@ AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON], |
1052 |
+ fi |
1053 |
+ fi |
1054 |
+ |
1055 |
++ if test $ok = yes; then |
1056 |
++ if test x"$host" != x ; then |
1057 |
++ if test -z "$use_gpgrt_config"; then |
1058 |
++ libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none` |
1059 |
++ else |
1060 |
++ libassuan_config_host=`$LIBASSUAN_CONFIG --variable=host 2>/dev/null || echo none` |
1061 |
++ fi |
1062 |
++ if test x"$libassuan_config_host" != xnone ; then |
1063 |
++ if test x"$libassuan_config_host" != x"$host" ; then |
1064 |
++ AC_MSG_WARN([[ |
1065 |
++*** |
1066 |
++*** The config script "$LIBASSUAN_CONFIG" was |
1067 |
++*** built for $libassuan_config_host and thus may not match the |
1068 |
++*** used host $host. |
1069 |
++*** You may want to use the configure option --with-libassuan-prefix |
1070 |
++*** to specify a matching config script. |
1071 |
++***]]) |
1072 |
++ fi |
1073 |
++ fi |
1074 |
++ fi |
1075 |
++ fi |
1076 |
+ ]) |
1077 |
+ |
1078 |
+ dnl AM_CHECK_LIBASSUAN([MINIMUM-VERSION, |
1079 |
+@@ -120,8 +159,8 @@ dnl |
1080 |
+ AC_DEFUN([AM_PATH_LIBASSUAN], |
1081 |
+ [ _AM_PATH_LIBASSUAN_COMMON($1) |
1082 |
+ if test $ok = yes; then |
1083 |
+- LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags` |
1084 |
+- LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs` |
1085 |
++ LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG --cflags` |
1086 |
++ LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG --libs` |
1087 |
+ ifelse([$2], , :, [$2]) |
1088 |
+ else |
1089 |
+ LIBASSUAN_CFLAGS="" |
1090 |
+@@ -131,45 +170,3 @@ AC_DEFUN([AM_PATH_LIBASSUAN], |
1091 |
+ AC_SUBST(LIBASSUAN_CFLAGS) |
1092 |
+ AC_SUBST(LIBASSUAN_LIBS) |
1093 |
+ ]) |
1094 |
+- |
1095 |
+- |
1096 |
+-dnl AM_PATH_LIBASSUAN_PTH([MINIMUM-VERSION, |
1097 |
+-dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) |
1098 |
+-dnl Test for libassuan and define LIBASSUAN_PTH_CFLAGS and LIBASSUAN_PTH_LIBS |
1099 |
+-dnl |
1100 |
+-AC_DEFUN([AM_PATH_LIBASSUAN_PTH], |
1101 |
+-[ _AM_PATH_LIBASSUAN_COMMON($1,pth) |
1102 |
+- if test $ok = yes; then |
1103 |
+- LIBASSUAN_PTH_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --cflags` |
1104 |
+- LIBASSUAN_PTH_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --libs` |
1105 |
+- ifelse([$2], , :, [$2]) |
1106 |
+- else |
1107 |
+- LIBASSUAN_PTH_CFLAGS="" |
1108 |
+- LIBASSUAN_PTH_LIBS="" |
1109 |
+- ifelse([$3], , :, [$3]) |
1110 |
+- fi |
1111 |
+- AC_SUBST(LIBASSUAN_PTH_CFLAGS) |
1112 |
+- AC_SUBST(LIBASSUAN_PTH_LIBS) |
1113 |
+-]) |
1114 |
+- |
1115 |
+- |
1116 |
+-dnl AM_PATH_LIBASSUAN_PTHREAD([MINIMUM-VERSION, |
1117 |
+-dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) |
1118 |
+-dnl Test for libassuan and define LIBASSUAN_PTHREAD_CFLAGS |
1119 |
+-dnl and LIBASSUAN_PTHREAD_LIBS |
1120 |
+-dnl |
1121 |
+-AC_DEFUN([AM_PATH_LIBASSUAN_PTHREAD], |
1122 |
+-[ _AM_PATH_LIBASSUAN_COMMON($1,pthread) |
1123 |
+- if test $ok = yes; then |
1124 |
+- LIBASSUAN_PTHREAD_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --cflags` |
1125 |
+- LIBASSUAN_PTHREAD_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --libs` |
1126 |
+- ifelse([$2], , :, [$2]) |
1127 |
+- else |
1128 |
+- LIBASSUAN_PTHREAD_CFLAGS="" |
1129 |
+- LIBASSUAN_PTHREAD_LIBS="" |
1130 |
+- ifelse([$3], , :, [$3]) |
1131 |
+- fi |
1132 |
+- AC_SUBST(LIBASSUAN_PTHREAD_CFLAGS) |
1133 |
+- AC_SUBST(LIBASSUAN_PTHREAD_LIBS) |
1134 |
+-]) |
1135 |
+- |
1136 |
|
1137 |
diff --git a/app-crypt/gpa/gpa-0.10.0-r1.ebuild b/app-crypt/gpa/gpa-0.10.0-r1.ebuild |
1138 |
new file mode 100644 |
1139 |
index 000000000000..f8dd22fbdcb4 |
1140 |
--- /dev/null |
1141 |
+++ b/app-crypt/gpa/gpa-0.10.0-r1.ebuild |
1142 |
@@ -0,0 +1,42 @@ |
1143 |
+# Copyright 1999-2022 Gentoo Authors |
1144 |
+# Distributed under the terms of the GNU General Public License v2 |
1145 |
+ |
1146 |
+EAPI=8 |
1147 |
+ |
1148 |
+inherit autotools xdg |
1149 |
+ |
1150 |
+DESCRIPTION="The GNU Privacy Assistant (GPA) is a graphical user interface for GnuPG" |
1151 |
+HOMEPAGE="http://gpa.wald.intevation.org" |
1152 |
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" |
1153 |
+ |
1154 |
+LICENSE="GPL-3" |
1155 |
+SLOT="0" |
1156 |
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" |
1157 |
+IUSE="nls" |
1158 |
+ |
1159 |
+RDEPEND=" |
1160 |
+ >=app-crypt/gnupg-2:= |
1161 |
+ >=app-crypt/gpgme-1.11.1:= |
1162 |
+ >=dev-libs/libassuan-1.1.0:= |
1163 |
+ >=dev-libs/libgpg-error-1.4:= |
1164 |
+ >=x11-libs/gtk+-2.10.0:2= |
1165 |
+" |
1166 |
+DEPEND="${RDEPEND}" |
1167 |
+BDEPEND="virtual/pkgconfig |
1168 |
+ nls? ( sys-devel/gettext )" |
1169 |
+ |
1170 |
+PATCHES=( |
1171 |
+ "${FILESDIR}"/${P}-autoconf.patch |
1172 |
+) |
1173 |
+ |
1174 |
+src_prepare() { |
1175 |
+ default |
1176 |
+ sed -i 's/Application;//' gpa.desktop |
1177 |
+ eautoreconf |
1178 |
+} |
1179 |
+ |
1180 |
+src_configure() { |
1181 |
+ econf \ |
1182 |
+ $(use_enable nls) \ |
1183 |
+ GPGKEYS_LDAP="/usr/libexec/gpgkeys_ldap" |
1184 |
+} |