diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 16:51:28 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 16:51:28 +0000 |
| commit | 940b4d1848e8c70ab7642901a68594e8016caffc (patch) | |
| tree | eb72f344ee6c3d9b80a7ecc079ea79e9fba8676d /external/gpgmepp/fix-autoconf-macros.patch | |
| parent | Initial commit. (diff) | |
| download | libreoffice-940b4d1848e8c70ab7642901a68594e8016caffc.tar.xz libreoffice-940b4d1848e8c70ab7642901a68594e8016caffc.zip | |
Adding upstream version 1:7.0.4.upstream/1%7.0.4upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'external/gpgmepp/fix-autoconf-macros.patch')
| -rw-r--r-- | external/gpgmepp/fix-autoconf-macros.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/external/gpgmepp/fix-autoconf-macros.patch b/external/gpgmepp/fix-autoconf-macros.patch new file mode 100644 index 000000000..627c7b152 --- /dev/null +++ b/external/gpgmepp/fix-autoconf-macros.patch @@ -0,0 +1,39 @@ +diff -ur gpgme.org/configure.ac gpgme/configure.ac +--- configure.ac 2017-02-16 15:18:45.051417378 +0100 ++++ configure.ac~ 2017-02-16 15:20:03.635059285 +0100 +@@ -35,6 +35,11 @@ + # decimalized short revision number, a beta version string, and a flag + # indicating a development version (mym4_isgit). Note that the m4 + # processing is done by autoconf and not during the configure run. ++m4_define([m4_chomp_all], ++[m4_format([[%.*s]], m4_bregexp(m4_translit([[$1]], [ ++/], [/ ]), [/*$]), [$1])]) ++ ++m4_define([m4_esyscmd_s], [m4_chomp_all(m4_esyscmd([$1]))]) + m4_define(mym4_version, + [mym4_version_major.mym4_version_minor.mym4_version_micro]) + m4_define([mym4_revision], +@@ -90,7 +90,22 @@ + AC_CONFIG_MACRO_DIR([m4]) + AC_CONFIG_SRCDIR(src/gpgme.h.in) + AC_CONFIG_HEADER(config.h) +-AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip]) ++ ++dnl Initialize automake. automake < 1.12 didn't have serial-tests and ++dnl gives an error if it sees this, but for automake >= 1.13 ++dnl serial-tests is required so we have to include it. Solution is to ++dnl test for the version of automake (by running an external command) ++dnl and provide it if necessary. Note we have to do this entirely using ++dnl m4 macros since automake queries this macro by running ++dnl 'autoconf --trace ...'. ++m4_define([serial_tests], [ ++ m4_esyscmd([automake --version | ++ head -1 | ++ awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { print "serial-tests" }}' ++ ]) ++]) ++AM_INIT_AUTOMAKE(foreign serial_tests dist-bzip2 no-dist-gzip) dnl NB: Do not [quote] this parameter. ++ + AM_MAINTAINER_MODE + AC_CANONICAL_HOST + AM_SILENT_RULES |