From: Mike Brady <mikebrady@eircom.net>
Date: Sat, 25 Aug 2018 12:08:37 +0000 (+0100)
Subject: Sometimes libsoxr is built to rely on libavutil. If libavutil is detected, link to... 
X-Git-Tag: 3.3RC0~240^2~3^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5101ab2d13e2b89ea3c1276df5fb7413634eeccd;p=thirdparty%2Fshairport-sync.git

Sometimes libsoxr is built to rely on libavutil. If libavutil is detected, link to it when building libsoxr. Add pgk_config support to soxr selection.
---

diff --git a/configure.ac b/configure.ac
index 0c917a43..2b6fddb3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -176,7 +176,20 @@ AC_ARG_WITH(ssl, [ choose --with-ssl=openssl, --with-ssl=mbedtls or --with-ssl=p
 # Look for soxr flag
 AC_ARG_WITH(soxr, [  --with-soxr = choose libsoxr for high-quality interpolation], [
   AC_MSG_RESULT(>>Including support for soxr-based interpolation)
-  AC_CHECK_LIB([soxr],[soxr_create], , AC_MSG_ERROR(soxr support requested but libsoxr not found!))], )
+  if  test "x${with_pkg_config}" = xyes ; then
+    PKG_CHECK_MODULES(
+        [SOXR], [soxr],
+        [LIBS="${SOXR_LIBS} ${LIBS}"])
+  else
+    AC_CHECK_LIB([avutil],[av_get_cpu_flags])
+    if  test "x${ac_cv_lib_avutil_av_get_cpu_flags}" = xyes ; then
+      # soxr may link against libavutil, depending on the architecture, but for the sake of simplicity link with it if it is found
+      AC_CHECK_LIB([soxr],[soxr_create], , AC_MSG_ERROR(soxr support requested but libsoxr not found!), [-lavutil])
+    else
+      AC_CHECK_LIB([soxr],[soxr_create], , AC_MSG_ERROR(soxr support requested but libsoxr not found!))
+    fi
+  fi
+], )
 
 # Look for metadata flag -- set flag for conditional compilation
 AC_ARG_WITH(metadata, [  --with-metadata = include support for a metadata feed], [