mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-24 02:31:03 +00:00
fix mad check, add defaut options properly
Original commit message from CVS: fix mad check, add defaut options properly
This commit is contained in:
parent
df0d0d6ba2
commit
0a2d71c77c
2 changed files with 5 additions and 2 deletions
|
@ -84,7 +84,7 @@ test ! -z "$CONFIGURE_DEF_OPT" && echo " ./configure default flags: $CONFIGURE_
|
||||||
test ! -z "$CONFIGURE_EXT_OPT" && echo " ./configure external flags: $CONFIGURE_EXT_OPT"
|
test ! -z "$CONFIGURE_EXT_OPT" && echo " ./configure external flags: $CONFIGURE_EXT_OPT"
|
||||||
echo
|
echo
|
||||||
|
|
||||||
./configure $CONFIGURE_OPT $CONFIGURE_EXT_OPT || {
|
./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT || {
|
||||||
echo " configure failed"
|
echo " configure failed"
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
|
@ -458,7 +458,10 @@ GST_CHECK_FEATURE(MAD, [mad mp3 decoder], mad, [
|
||||||
if test "x$HAVE_MAD" = "xyes"; then
|
if test "x$HAVE_MAD" = "xyes"; then
|
||||||
# installed with mad >= 0.14
|
# installed with mad >= 0.14
|
||||||
HAVE_MAD="no"
|
HAVE_MAD="no"
|
||||||
|
save_libs=$LIBS
|
||||||
|
LIBS="-lz"
|
||||||
AC_CHECK_LIB(id3tag, id3_tag_query, HAVE_MAD="yes" MAD_LIBS="$MAD_LIBS -lid3tag")
|
AC_CHECK_LIB(id3tag, id3_tag_query, HAVE_MAD="yes" MAD_LIBS="$MAD_LIBS -lid3tag")
|
||||||
|
LIBS=$save_libs
|
||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
AC_SUBST(MAD_LIBS)
|
AC_SUBST(MAD_LIBS)
|
||||||
|
|
Loading…
Reference in a new issue