gpg4libre: fix build for older autoconf/automake versions

- serial-tests fix from Richard Jones' libguestfs (lgplv2+)
(needed for automake < 1.12)
- m4_esyscmd fix from slurm project (gplv2+), needed for
autoconf < 2.62 or so
- m4_argn from m4 sugar (gplv3+ with autoconf exceptions)
- AC_CHECK_FUNCS does not like nested macros, so outline dependend
AC_CHECK_HEADERS
- only build c and c++ bindings for gpgme, we don't need anything
else internally.

Change-Id: Ic65ca92119efda585ebc9acbfb7c6c2ac2585451
Reviewed-on: https://gerrit.libreoffice.org/34349
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Siegmund Gorr <siegmund.gorr@cib.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>

3 files changed, 41 insertions, 0 deletions

diff --git a/external/gpgme/ExternalProject_gpgme.mk b/external/gpgme/ExternalProject_gpgme.mk
index f27794f32e4a..5c329690c2a7 100644
--- a/external/gpgme/ExternalProject_gpgme.mk
+++ b/external/gpgme/ExternalProject_gpgme.mk
@@ -21,6 +21,7 @@ $(call gb_ExternalProject_get_state_target,gpgme,build):
 	$(call gb_ExternalProject_run,build,\
 		autoreconf \
 		&& ./configure \
+		   --enable-languages="cl cpp" \
 		   GPG_ERROR_CFLAGS="$(GPG_ERROR_CFLAGS)" \
 		   GPG_ERROR_LIBS="$(GPG_ERROR_LIBS)" \
 		   LIBASSUAN_CFLAGS="$(LIBASSUAN_CFLAGS)" \
diff --git a/external/gpgme/UnpackedTarball_gpgme.mk b/external/gpgme/UnpackedTarball_gpgme.mk
index a6b79c4f836b..ca9fd79feaab 100644
--- a/external/gpgme/UnpackedTarball_gpgme.mk
+++ b/external/gpgme/UnpackedTarball_gpgme.mk
@@ -15,5 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,gpgme,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,gpgme, \
     external/gpgme/find-libgpg-error-libassuan.patch \
+    external/gpgme/fix-autoconf-macros.patch \
 ))
 # vim: set noet sw=4 ts=4:
diff --git a/external/gpgme/fix-autoconf-macros.patch b/external/gpgme/fix-autoconf-macros.patch
new file mode 100644
index 000000000000..627c7b15247a
--- /dev/null
+++ b/external/gpgme/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