external/libgpg-error/fix-autoconf-macros.patch

   1 diff -ur libgpg-error.org/configure.ac libgpg-error/configure.ac
   2 --- configure.ac        2017-02-16 18:43:50.697941033 +0100
   3 +++ configure.ac~       2017-02-16 18:44:07.085881259 +0100
   4 @@ -33,6 +33,11 @@
   5  # decimalized short revision number, a beta version string, and a flag
   6  # indicating a development version (mym4_isgit). Note that the m4
   7  # processing is done by autoconf and not during the configure run.
   8 +m4_define([m4_chomp_all],
   9 +[m4_format([[%.*s]], m4_bregexp(m4_translit([[$1]], [
  10 +/], [/ ]), [/*$]), [$1])])
  11 +
  12 +m4_define([m4_esyscmd_s], [m4_chomp_all(m4_esyscmd([$1]))])
  13  m4_define([mym4_version], [mym4_version_major.mym4_version_minor])
  14  m4_define([mym4_revision],
  15            m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r']))
  16 @@ -65,7 +70,22 @@
  17  AC_SUBST(VERSION_NUMBER)
  18
  19  AC_CONFIG_AUX_DIR([build-aux])
  20 -AM_INIT_AUTOMAKE([serial-tests dist-bzip2])
  21 +
  22 +dnl Initialize automake.  automake < 1.12 didn't have serial-tests and
  23 +dnl gives an error if it sees this, but for automake >= 1.13
  24 +dnl serial-tests is required so we have to include it.  Solution is to
  25 +dnl test for the version of automake (by running an external command)
  26 +dnl and provide it if necessary.  Note we have to do this entirely using
  27 +dnl m4 macros since automake queries this macro by running
  28 +dnl 'autoconf --trace ...'.
  29 +m4_define([serial_tests], [
  30 +    m4_esyscmd([automake --version |
  31 +                head -1 |
  32 +                awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { print "serial-tests" }}'
  33 +    ])
  34 +])
  35 +AM_INIT_AUTOMAKE(foreign serial_tests dist-bzip2) dnl NB: Do not [quote] this parameter.
  36 +
  37  AM_MAINTAINER_MODE
  38  AC_CONFIG_SRCDIR([src/err-sources.h.in])
  39  AC_CONFIG_HEADER([config.h])