diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2001-12-23 18:00:34 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2001-12-23 18:00:34 +0000 |
| commit | fea946fd722030ef681787668ba836a071125d82 (patch) | |
| tree | e57d780d61b1c61e1fe76de79db807f728324378 | |
| parent | 803abec4c25979d0c14a695b1dc347affc770ae0 (diff) | |
fixing some fixes
Original commit message from CVS:
fixing some fixes
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | ext/Makefile.am | 4 |
3 files changed, 8 insertions, 4 deletions
@@ -36,3 +36,5 @@ * check if we can drop some of the AC_SUBST's for libs and cflags + +* the mikmod author needs to drop the lib from the name ;) diff --git a/configure.ac b/configure.ac index d065d669..6517fb2c 100644 --- a/configure.ac +++ b/configure.ac @@ -525,9 +525,11 @@ GST_CHECK_FEATURE(MAD, [mad mp3 decoder], mad, [ AC_SUBST(MAD_LIBS) dnl *** mikmod *** -translit(dnm, m, l) AM_CONDITIONAL(USE_LIBMIKMOD, true) +translit(dnm, m, l) AM_CONDITIONAL(USE_MIKMOD, true) GST_CHECK_FEATURE(MIKMOD, [mikmod plugin], mikmod, [ - AM_PATH_LIBMIKMOD(, HAVE_LIBMIKMOD=yes, HAVE_LIBMIKMOD=no) + AM_PATH_LIBMIKMOD(, HAVE_MIKMOD=yes, HAVE_MIKMOD=no) + AC_SUBST(MIKMOD_LIBS, "$LIBMIKMOD_LIBS") + AC_SUBST(MIKMOD_CFLAGS, "$LIBMIKMODCFLAGS") ]) dnl *** mpeg2dec *** diff --git a/ext/Makefile.am b/ext/Makefile.am index 52576c89..b2a8fda9 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -71,9 +71,9 @@ FLAC_DIR= endif if USE_GNOME_VFS -GNOME_VFS_DIR=gnomevfs +GNOMEVFS_DIR=gnomevfs else -GNOME_VFS_DIR= +GNOMEVFS_DIR= endif if USE_HERMES |