1From 900b1827c55cc6020b3242640075174c2e6b12a5 Mon Sep 17 00:00:00 2001
2From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3Date: Wed, 4 Aug 2021 22:16:40 +0200
4Subject: [PATCH] configure.ac: find sndfile through pkg-config
5
6Find sndfile through pkg-config to retrieve sndfile dependencies such as
7flac and avoid the following static build failure:
8
9/tmp/instance-3/output-1/host/lib/gcc/xtensa-buildroot-linux-uclibc/10.3.0/../../../../xtensa-buildroot-linux-uclibc/bin/ld: /tmp/instance-3/output-1/host/bin/../xtensa-buildroot-linux-uclibc/sysroot/usr/lib/libsndfile.a(libsndfile_la-flac.o): in function `flac_byterate':
10flac.c:(.text+0xfc): undefined reference to `FLAC__StreamDecoderErrorStatusString'
11
12Fixes:
13 - http://autobuild.buildroot.org/results/92ed30a6855ca11800b779718822bcba4a69c9a3
14
15Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
16[Upstream status: https://github.com/mikebrady/shairport-sync/pull/1263]
17---
18 configure.ac | 9 ++++++++-
19 1 file changed, 8 insertions(+), 1 deletion(-)
20
21diff --git a/configure.ac b/configure.ac
22index f77087c5..9b982c51 100644
23--- a/configure.ac
24+++ b/configure.ac
25@@ -304,7 +304,14 @@ AC_ARG_WITH(convolution, [AS_HELP_STRING([--with-convolution],[choose audio DSP
26 if test "x$with_convolution" = "xyes" ; then
27   AM_INIT_AUTOMAKE([subdir-objects])
28   AC_DEFINE([CONFIG_CONVOLUTION], 1, [Include audio DSP convolution support.])
29-  AC_CHECK_LIB([sndfile], [sf_open], , AC_MSG_ERROR(Convolution support requires the sndfile library -- libsndfile1-dev suggested!))
30+  if  test "x${with_pkg_config}" = xyes ; then
31+    PKG_CHECK_MODULES(
32+      [sndfile], [sndfile],
33+      [CFLAGS="${sndfile_CFLAGS} ${CFLAGS}"
34+      LIBS="${sndfile_LIBS} ${LIBS}"], AC_MSG_ERROR(Convolution support requires the sndfile library -- libsndfile1-dev suggested!))
35+  else
36+    AC_CHECK_LIB([sndfile], [sf_open], , AC_MSG_ERROR(Convolution support requires the sndfile library -- libsndfile1-dev suggested!))
37+  fi
38 fi
39 AM_CONDITIONAL([USE_CONVOLUTION], [test "x$with_convolution" = "xyes"])
40
41--
422.30.2
43
44