mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 17:20:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

fix mad check, add defaut options properly

Browse source 
Original commit message from CVS:
fix mad check, add defaut options properly
This commit is contained in:
Andy Wingo 2002-02-10 15:12:25 +00:00
parent 4723597a5b
commit ca6ce59de6
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
autogen.sh
View file

@ -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
} }

2
common

@ -1 +1 @@
Subproject commit c2d7711457d468d527890f2057883c133b50c3b7 Subproject commit 42efc7fe3eda3ea184fa620f2e0dbc4977f16c26

5
configure.ac
View file

@ -21,7 +21,7 @@ AC_SUBST(GST_LIBVERSION)
dnl Add parameters for aclocal dnl Add parameters for aclocal
dnl (This must come after AM_INIT_AUTOMAKE, since it modifies ACLOCAL) dnl (This must come after AM_INIT_AUTOMAKE, since it modifies ACLOCAL)
ACLOCAL="cat m4/*.m4 >acinclude.m4;$ACLOCAL $ACLOCAL_FLAGS" ACLOCAL="cat m4/*.m4>acinclude.m4;$ACLOCAL $ACLOCAL_FLAGS"
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
@ -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)