1From ad22edb303a470b6f9eda9fd9d3f588bb2eff8cb Mon Sep 17 00:00:00 2001
2From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3Date: Fri, 15 Oct 2021 08:02:23 +0200
4Subject: [PATCH] configure.ac: fix build with automake 1.16.5
5
6Fix the following build failure with convolution raised since automake
71.16.5 and
8https://git.savannah.gnu.org/cgit/automake.git/commit/?id=f4a3a70f69e1dbccb6578f39ef47835098a04624:
9
10configure.ac:305: error: AM_INIT_AUTOMAKE expanded multiple times
11/home/giuliobenetti/autobuild/run/instance-1/output-1/host/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from...
12configure.ac:6: the top level
13/home/giuliobenetti/autobuild/run/instance-1/output-1/host/share/aclocal-1.16/init.m4:29: AM_INIT_AUTOMAKE is expanded from...
14configure.ac:305: the top level
15
16Fixes:
17 - http://autobuild.buildroot.org/results/464148bdccb705d8992dc860262bfdeb01b7e2a1
18
19Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
20[Upstream status: https://github.com/mikebrady/shairport-sync/pull/1314]
21---
22 configure.ac | 3 +--
23 1 file changed, 1 insertion(+), 2 deletions(-)
24
25diff --git a/configure.ac b/configure.ac
26index f77087c5..aa533a2d 100644
27--- a/configure.ac
28+++ b/configure.ac
29@@ -3,7 +3,7 @@
30
31 AC_PREREQ([2.50])
32 AC_INIT([shairport-sync], [3.3.8], [4265913+mikebrady@users.noreply.github.com])
33-AM_INIT_AUTOMAKE
34+AM_INIT_AUTOMAKE([subdir-objects])
35 AC_CONFIG_SRCDIR([shairport.c])
36 AC_CONFIG_HEADERS([config.h])
37 AC_PROG_RANLIB
38@@ -302,7 +302,6 @@ AM_CONDITIONAL([USE_PA], [test "x$with_pa" = "xyes"])
39 # Look for Convolution flag
40 AC_ARG_WITH(convolution, [AS_HELP_STRING([--with-convolution],[choose audio DSP convolution support])])
41 if test "x$with_convolution" = "xyes" ; then
42-  AM_INIT_AUTOMAKE([subdir-objects])
43   AC_DEFINE([CONFIG_CONVOLUTION], 1, [Include audio DSP convolution support.])
44   AC_CHECK_LIB([sndfile], [sf_open], , AC_MSG_ERROR(Convolution support requires the sndfile library -- libsndfile1-dev suggested!))
45 fi
46--
472.33.0
48
49