aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-02-18 18:39:19 +0100
committerMax Kellermann <max@duempel.org>2014-02-18 18:39:19 +0100
commit7fee85c80ab5e0bf16f26e353a32026144dae6a4 (patch)
tree5cf5b2ef6e80475b1ef9514c3070630fc7e85395
parent5d87a274a5cc30741d9e483fa189cbeb3c6087ba (diff)
downloadmpd-7fee85c80ab5e0bf16f26e353a32026144dae6a4.tar.gz
mpd-7fee85c80ab5e0bf16f26e353a32026144dae6a4.tar.xz
mpd-7fee85c80ab5e0bf16f26e353a32026144dae6a4.zip
configure.ac: fix linker failure when libvorbis/libogg are static
Link libvorbisfile first, followed to libvorbis and finally libogg. This order is necessary because libvorbisfile depends on libvorbis.
-rw-r--r--NEWS2
-rw-r--r--configure.ac2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index f671b1e75..f12530e60 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,6 @@
ver 0.18.9 (not yet released)
+* decoder
+ - vorbis: fix linker failure when libvorbis/libogg are static
* encoder
- vorbis: fix another linker failure
diff --git a/configure.ac b/configure.ac
index 471504527..81bdcea24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1023,7 +1023,7 @@ if test x$enable_tremor = xyes; then
fi
fi
-MPD_AUTO_PKG(vorbis, VORBIS, [vorbis vorbisfile ogg],
+MPD_AUTO_PKG(vorbis, VORBIS, [vorbisfile vorbis ogg],
[Ogg Vorbis decoder], [libvorbis not found])
if test x$enable_vorbis = xyes; then
AC_DEFINE(ENABLE_VORBIS_DECODER, 1, [Define for Ogg Vorbis support])