mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-24 02:31:03 +00:00
mad: make check for mad independent of the check for id3tag
Fixes bug #590432.
This commit is contained in:
parent
6adb49c501
commit
228e19fb19
1 changed files with 18 additions and 2 deletions
18
configure.ac
18
configure.ac
|
@ -310,9 +310,25 @@ AG_GST_CHECK_FEATURE(ID3TAG, [id3tag reading and writing from the MAD project],
|
||||||
dnl *** mad ***
|
dnl *** mad ***
|
||||||
translit(dnm, m, l) AM_CONDITIONAL(USE_MAD, true)
|
translit(dnm, m, l) AM_CONDITIONAL(USE_MAD, true)
|
||||||
AG_GST_CHECK_FEATURE(MAD, [mad mp3 decoder], mad, [
|
AG_GST_CHECK_FEATURE(MAD, [mad mp3 decoder], mad, [
|
||||||
|
|
||||||
|
dnl check with pkg-config first
|
||||||
|
AG_GST_PKG_CHECK_MODULES(ID3TAG, id3tag >= 0.15)
|
||||||
|
if test "x$HAVE_ID3TAG" = "xno"; then
|
||||||
|
dnl fall back to oldskool detection
|
||||||
|
AC_CHECK_HEADER(id3tag.h, [
|
||||||
|
save_LIBS=$LIBS
|
||||||
|
LIBS="-lz"
|
||||||
|
AC_CHECK_LIB(id3tag, id3_tag_options,
|
||||||
|
HAVE_ID3TAG="yes" ID3TAG_LIBS="-lid3tag -lz")
|
||||||
|
LIBS=$save_LIBS
|
||||||
|
AC_SUBST(ID3TAG_LIBS)
|
||||||
|
])
|
||||||
|
fi
|
||||||
|
|
||||||
if test "x$HAVE_ID3TAG" = "xyes"; then
|
if test "x$HAVE_ID3TAG" = "xyes"; then
|
||||||
dnl check with pkg-config first
|
dnl check with pkg-config first
|
||||||
AG_GST_PKG_CHECK_MODULES(MAD, mad >= 0.15 id3tag >= 0.15)
|
AG_GST_PKG_CHECK_MODULES(MAD, mad >= 0.15)
|
||||||
|
MAD_LIBS="$MAD_LIBS $ID3TAG_LIBS"
|
||||||
if test "x$HAVE_MAD" = "xno"; then
|
if test "x$HAVE_MAD" = "xno"; then
|
||||||
dnl fall back to oldskool detection
|
dnl fall back to oldskool detection
|
||||||
AC_CHECK_HEADER(mad.h, [
|
AC_CHECK_HEADER(mad.h, [
|
||||||
|
|
Loading…
Reference in a new issue