From 51dbb4e4faba696e1ad75f8acac82e66e2013a33 Mon Sep 17 00:00:00 2001
From: richardash1981 <richardash1981@47890b92-0858-11df-a26f-8b716316a5bc>
Date: Sat, 9 Aug 2014 19:53:02 +0000
Subject: [PATCH] Set the correct PREFIX for the call to PKG_CHECK_MODULES,
without which the required libraries are not added to the link command and
the final link fails. This was broken in the conversion to automake when
variable assignments to achive this were removed
---
m4/audacity_checklib_libsamplerate.m4 | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/m4/audacity_checklib_libsamplerate.m4 b/m4/audacity_checklib_libsamplerate.m4
index da946e9d6..4a3fca135 100644
--- a/m4/audacity_checklib_libsamplerate.m4
+++ b/m4/audacity_checklib_libsamplerate.m4
@@ -7,16 +7,17 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBSAMPLERATE], [
AC_ARG_WITH(libsamplerate,
[AS_HELP_STRING([--with-libsamplerate],
- [use libsamplerate for sample rate conversion. Do not use in conjunction with VST plug-in support!])],
+ [use libsamplerate for sample rate conversion])],
LIBSAMPLERATE_ARGUMENT=$withval,
LIBSAMPLERATE_ARGUMENT="unspecified")
dnl see if libsamplerate is installed on the system
-
- PKG_CHECK_MODULES(SAMPLERATE, samplerate >= 0.1.2,
+ PKG_CHECK_MODULES(LIBSAMPLERATE_SYSTEM, samplerate >= 0.1.2,
LIBSAMPLERATE_SYSTEM_AVAILABLE="yes",
LIBSAMPLERATE_SYSTEM_AVAILABLE="no")
-
+ dnl the unusual choice of prefix above avoids having to re-assign the variables
+ dnl generates by PKG_CHECK_MODULES, which will be LIBSAMPLERATE_SYSTEML_LIBS and
+ dnl so on.
if test "$LIBSAMPLERATE_SYSTEM_AVAILABLE" = "yes" ; then
AC_MSG_NOTICE([Libsamplerate libraries are available as system libraries])
else