summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2001-12-23 18:00:34 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2001-12-23 18:00:34 +0000
commit17202295d6560f73f3176f9df5571a911bf9fbf7 (patch)
tree83a2f4a03056303545380c0de4471b691da12c49
parentcdc297a371d4b4343590f1c7fc37ff41dd83ba0f (diff)
downloadgst-plugins-bad-17202295d6560f73f3176f9df5571a911bf9fbf7.tar.gz
gst-plugins-bad-17202295d6560f73f3176f9df5571a911bf9fbf7.tar.bz2
gst-plugins-bad-17202295d6560f73f3176f9df5571a911bf9fbf7.zip
fixing some fixes
Original commit message from CVS: fixing some fixes
-rw-r--r--TODO2
-rw-r--r--configure.ac6
-rw-r--r--ext/Makefile.am4
3 files changed, 8 insertions, 4 deletions
diff --git a/TODO b/TODO
index 86dc889e..7afa5016 100644
--- 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 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