summaryrefslogtreecommitdiffstats
path: root/rbutil/rbutilqt/rbutilqt.pro
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 /rbutil/rbutilqt/rbutilqt.pro
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 'rbutil/rbutilqt/rbutilqt.pro')
-rw-r--r--rbutil/rbutilqt/rbutilqt.pro10
1 files changed, 5 insertions, 5 deletions
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro
index b09bd19bab..d21731fb8c 100644
--- a/rbutil/rbutilqt/rbutilqt.pro
+++ b/rbutil/rbutilqt/rbutilqt.pro
@@ -29,12 +29,12 @@ 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 --silence-errors --libs speex)
+# check for system speex. Add a custom rule for pre-building librbspeex if not
+# found. Newer versions of speex are split up into libspeex and libspeexdsp,
+# and some distributions package them separately. Check for both and fall back
+# to librbspeex if not found.
+LIBSPEEX = $$system(pkg-config --silence-errors --libs speex speexdsp)
!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
}
# custom rules for rockbox-specific libs