diff options
| author | Andy Wingo <wingo@pobox.com> | 2002-02-10 15:12:25 +0000 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2002-02-10 15:12:25 +0000 |
| commit | 9add402512b6e9583be43d85aaa69ba4f2ee2bf4 (patch) | |
| tree | 29297ee6862f8bd3e53ae51ef8262df589c6a995 | |
| parent | d02cd6b3020fc184f291c07426d158e13a99f8ca (diff) | |
fix mad check, add defaut options properly
Original commit message from CVS:
fix mad check, add defaut options properly
| -rwxr-xr-x | autogen.sh | 2 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | configure.ac | 5 |
3 files changed, 5 insertions, 2 deletions
diff --git a/autogen.sh b/autogen.sh index fb1b2e979..b1af3b5cd 100755 --- a/autogen.sh +++ b/autogen.sh @@ -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" echo -./configure $CONFIGURE_OPT $CONFIGURE_EXT_OPT || { +./configure $CONFIGURE_DEF_OPT $CONFIGURE_EXT_OPT || { echo " configure failed" exit 1 } diff --git a/common b/common -Subproject c2d7711457d468d527890f2057883c133b50c3b +Subproject 42efc7fe3eda3ea184fa620f2e0dbc4977f16c2 diff --git a/configure.ac b/configure.ac index 18906f733..01311da9c 100644 --- a/configure.ac +++ b/configure.ac @@ -21,7 +21,7 @@ AC_SUBST(GST_LIBVERSION) dnl Add parameters for 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 @@ -458,7 +458,10 @@ GST_CHECK_FEATURE(MAD, [mad mp3 decoder], mad, [ if test "x$HAVE_MAD" = "xyes"; then # installed with mad >= 0.14 HAVE_MAD="no" + save_libs=$LIBS + LIBS="-lz" AC_CHECK_LIB(id3tag, id3_tag_query, HAVE_MAD="yes" MAD_LIBS="$MAD_LIBS -lid3tag") + LIBS=$save_libs fi ]) AC_SUBST(MAD_LIBS) |