From c99d63660ff38c9504c930aed3970e93ae64c483 Mon Sep 17 00:00:00 2001
From: bluebrother <bluebrother@a1c6a512-1295-4272-9138-f99709370657>
Date: Tue, 13 Oct 2009 20:53:25 +0000
Subject: [PATCH] Fix building Rockbox Utility when using newer versions of
 libspeex.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23164 a1c6a512-1295-4272-9138-f99709370657
---
 rbutil/rbutilqt/rbutilqt.pro | 7 +++++--
 tools/rbspeex/Makefile       | 5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index 4b170cd01..e705497b1 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -28,8 +28,11 @@ RBBASE_DIR = $$replace(RBBASE_DIR,/rbutil/rbutilqt,)
 message("Rockbox Base dir: "$$RBBASE_DIR)
 
 # check for system speex. Add a custom rule for pre-building librbspeex if not found.
-LIBSPEEX = $$system(pkg-config --libs speex)
-!static:!isEmpty(LIBSPEEX) {
+LIBSPEEX = $$system(pkg-config --silence-errors --libs speex)
+!static:!isEmpty(LIBSPEEX)
+    # newer versions of speex are split up into libspeex and libspeexdsp.
+    # avoid checking twice if libspeex is missing.
+    LIBSPEEX += $$system(pkg-config --silence-errors --libs speexdsp)
     LIBS += $$LIBSPEEX
 }
 !mac {
diff --git a/tools/rbspeex/Makefile b/tools/rbspeex/Makefile
index 8c46677ce..87ce08f3e 100644
--- a/tools/rbspeex/Makefile
+++ b/tools/rbspeex/Makefile
@@ -33,7 +33,10 @@ endif
 
 # don't try to use the systems libspeex when building a static binary.
 ifndef STATIC
-SYS_SPEEX = $(shell pkg-config --libs speex)
+SYS_SPEEX = $(shell pkg-config --silence-errors --libs speex)
+ifneq ($(SYS_SPEEX),)
+SYS_SPEEX += $(shell pkg-config --silence-errors --libs speexdsp)
+endif
 endif
 
 # fall back to our own librbspeex if no suitable found.
-- 
2.11.4.GIT