summaryrefslogtreecommitdiffstats
path: root/tools/rbspeex/Makefile
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2009-12-06 10:19:43 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2009-12-06 10:19:43 +0000
commite8bab4e3a0eccf8a2b855174ccb02737b84eedb9 (patch)
tree8261225115ea52425a8e6ebae34548871c97baf3 /tools/rbspeex/Makefile
parentd587794dfc6db8c14dabe8f5039a27c6e396b071 (diff)
downloadrockbox-e8bab4e3a0eccf8a2b855174ccb02737b84eedb9.tar.gz
rockbox-e8bab4e3a0eccf8a2b855174ccb02737b84eedb9.tar.bz2
rockbox-e8bab4e3a0eccf8a2b855174ccb02737b84eedb9.zip
Improve detection of system libspeex and fallback earlier.
libspeex is split into libspeex and libspeexdsp. We need both, so check for them the same time instead of trying to respect the fact that old versions didn't have the libspeexdsp part. Should fix issues with distributions that have libspeex and libspeexdsp split into separate packages and only the libspeex one is installed. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23872 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools/rbspeex/Makefile')
-rw-r--r--tools/rbspeex/Makefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/rbspeex/Makefile b/tools/rbspeex/Makefile
index 6385c8a869..780fff2472 100644
--- a/tools/rbspeex/Makefile
+++ b/tools/rbspeex/Makefile
@@ -29,10 +29,7 @@ endif
# don't try to use the systems libspeex when building a static binary.
ifndef STATIC
-SYS_SPEEX = $(shell pkg-config --silence-errors --libs speex)
-ifneq ($(SYS_SPEEX),)
-SYS_SPEEX += $(shell pkg-config --silence-errors --libs speexdsp)
-endif
+SYS_SPEEX = $(shell pkg-config --silence-errors --libs speex speexdsp)
endif
# fall back to our own librbspeex if no suitable found.