external/gpgmepp/find-libgpg-error-libassuan.patch

   1 diff --git a/configure.ac b/configure.ac
   2 index f28480b..92a3e85 100644
   3 --- configure.ac
   4 +++ configure.ac
   5 @@ -719,8 +719,18 @@
   6
   7  # Checking for libgpg-error.
   8  have_gpg_error=no
   9 -AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION",
  10 -                  have_gpg_error=yes, have_gpg_error=no)
  11 +if test "x${GPG_ERROR_CFLAGS}" = x; then
  12 +  AM_PATH_GPG_ERROR("$NEED_GPG_ERROR_VERSION",
  13 +                have_gpg_error=yes, have_gpg_error=no)
  14 +else
  15 +  have_gpg_error=yes
  16 +  GPG_ERROR_CFLAGS="$GPG_ERROR_CFLAGS"
  17 +  GPG_ERROR_LIBS="$GPG_ERROR_LIBS"
  18 +  AC_SUBST(GPG_ERROR_CFLAGS)
  19 +  AC_SUBST(GPG_ERROR_LIBS)
  20 +
  21 +fi
  22 +
  23  AC_DEFINE(GPG_ERR_SOURCE_DEFAULT, GPG_ERR_SOURCE_GPGME,
  24            [The default error source for GPGME.])
  25
  26 @@ -729,8 +739,17 @@
  27
  28  # And for libassuan.
  29  have_libassuan=no
  30 -AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
  31 +if test "x${LIBASSUAN_CFLAGS}" = x; then
  32 +  AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_API:$NEED_LIBASSUAN_VERSION",
  33                    have_libassuan=yes, have_libassuan=no)
  34 +else
  35 +  have_libassuan=yes
  36 +  LIBASSUAN_CFLAGS="$LIBASSUAN_CFLAGS"
  37 +  LIBASSUAN_LIBS="$LIBASSUAN_LIBS"
  38 +  AC_SUBST(LIBASSUAN_CFLAGS)
  39 +  AC_SUBST(LIBASSUAN_LIBS)
  40 +fi
  41 +
  42  if test "$have_libassuan" = "yes"; then
  43    AC_DEFINE_UNQUOTED(GPGME_LIBASSUAN_VERSION, "$libassuan_version",
  44                       [version of the libassuan library])
  45 --- lang/cpp/tests/Makefile.am  2020-06-20 00:43:49.213657887 +0200
  46 +++ lang/cpp/tests/Makefile.am~ 2019-01-25 13:27:34.000000000 +0100
  47 @@ -21,7 +21,7 @@
  48  AM_LDFLAGS = -no-install
  49
  50  LDADD = ../../cpp/src/libgpgmepp.la \
  51 +        ../../../src/libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ \
  52 -        ../../../src/libgpgme.la @GPG_ERROR_LIBS@ \
  53          @LDADD_FOR_TESTS_KLUDGE@ -lstdc++
  54
  55  AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \
  56 --- lang/cpp/tests/Makefile.in  2020-06-20 00:44:49.542344510 +0200
  57 +++ lang/cpp/tests/Makefile.in~ 2020-06-13 00:55:19.021212970 +0200
  58 @@ -427,7 +427,7 @@
  59  top_srcdir = @top_srcdir@
  60  AM_LDFLAGS = -no-install
  61  LDADD = ../../cpp/src/libgpgmepp.la \
  62 +        ../../../src/libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@ \
  63 -        ../../../src/libgpgme.la @GPG_ERROR_LIBS@ \
  64          @LDADD_FOR_TESTS_KLUDGE@ -lstdc++
  65
  66  AM_CPPFLAGS = -I$(top_srcdir)/lang/cpp/src -I$(top_builddir)/src \