fixing some fixes

Original commit message from CVS:
fixing some fixes

diff --git a/TODO b/TODO
index 86dc889eab802b3fb7eca3dba855a03fed753098..7afa50160a12086f52ec24943ca99abd5327b7c2 100644 (file)
--- a/TODO
+++ b/TODO
@@ -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 d065d66988009eac6bb4570117e0e28ac3c54c28..6517fb2c3008168124489c72c7bdf5d035150b3e 100644 (file)
--- 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 52576c898720bb9ea858683f857979a30a88b4b3..b2a8fda9cff29459e5e148d67e666261566011b2 100644 (file)
--- 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