cid#1636561 Dereference after null check
[LibreOffice.git] / external / libassuan / fix-autoconf-macros.patch
blob743ca460ba9dcb91d8be06be9ff508fc3dfc3083
1 diff -ur libassuan.org/configure.ac libassuan/configure.ac
2 --- configure.ac 2017-02-16 18:32:51.549527554 +0100
3 +++ configure.ac~ 2017-02-16 18:32:59.893497890 +0100
4 @@ -75,7 +80,22 @@
5 AC_SUBST(LIBASSUAN_LT_REVISION)
7 AC_CONFIG_AUX_DIR([build-aux])
8 -AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip])
10 +dnl Initialize automake. automake < 1.12 didn't have serial-tests and
11 +dnl gives an error if it sees this, but for automake >= 1.13
12 +dnl serial-tests is required so we have to include it. Solution is to
13 +dnl test for the version of automake (by running an external command)
14 +dnl and provide it if necessary. Note we have to do this entirely using
15 +dnl m4 macros since automake queries this macro by running
16 +dnl 'autoconf --trace ...'.
17 +m4_define([serial_tests], [
18 + m4_esyscmd([automake --version |
19 + head -1 |
20 + awk '{split ($NF,a,"."); if (a[1] == 1 && a[2] >= 12) { print "serial-tests" }}'
21 + ])
22 +])
23 +AM_INIT_AUTOMAKE(foreign serial_tests dist-bzip2 no-dist-gzip) dnl NB: Do not [quote] this parameter.
25 AM_MAINTAINER_MODE
26 AC_CONFIG_SRCDIR(src/assuan.h.in)
27 AC_CONFIG_MACRO_DIR(m4)