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