d400009e7c
seen upstream & removed here: - external/gpgmepp/add-gpgme_set_global_flag-wrapper.patch - external/gpgmepp/version.patch - external/libgpg-error/clang-cl.patch - external/libgpg-error/libgpg-error_gawk5.patch Change-Id: Iea2b681fa839ae55cb954c2ad3edf4291b149dbe Reviewed-on: https://gerrit.libreoffice.org/c/core/+/61322 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
39 lines
1.7 KiB
Diff
39 lines
1.7 KiB
Diff
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 @@
|
|
# the decimalized short revision number, a beta version string and a
|
|
# flag indicating a development version (mym4_isbeta). 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_verslist], m4_split(m4_esyscmd([./autogen.sh --find-version] \
|
|
mym4_package mym4_major mym4_minor mym4_micro),[:]))
|
|
m4_define([mym4_isbeta], m4_argn(2, mym4_verslist))
|
|
@@ -90,7 +90,22 @@
|
|
AC_CONFIG_MACRO_DIR([m4])
|
|
AC_CONFIG_SRCDIR(src/gpgme.h.in)
|
|
AC_CONFIG_HEADER(conf/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
|