From 8211ed26bd0bf66beb6f4baffdb18233adff30c4 Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Sun, 23 Dec 2001 16:11:28 +0000
Subject: [PATCH] xmms

Original commit message from CVS:
xmms
---
 TODO            |  6 +++++-
 configure.ac    | 10 +++++-----
 ext/Makefile.am | 11 +++++++++--
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/TODO b/TODO
index 36e7754753..ec1525561a 100644
--- a/TODO
+++ b/TODO
@@ -26,4 +26,8 @@
 
 * fix ffmpeg
 
-* add ladspa header check stuff
+* add ladspa header check stuff and dir stuff
+
+* make sidplay stuff ok, the source is on the net ;)
+
+* fix xmms plugin, doesn't register atm
diff --git a/configure.ac b/configure.ac
index 61e40d98c9..996acac940 100644
--- a/configure.ac
+++ b/configure.ac
@@ -585,10 +585,10 @@ GST_CHECK_FEATURE(VORBIS, [vorbis plugin], vorbisenc vorbisdec, [
   AM_PATH_VORBIS(HAVE_VORBIS=yes, HAVE_VORBIS=no)
 ])
 
-dnl *** xmms ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_LIBXMMS, true)
-GST_CHECK_FEATURE(LIBXMMS, [xmms plugin], xmms, [
-  AM_PATH_XMMS(0.1.0, HAVE_LIBXMMS=yes, HAVE_LIBXMMS=no)
+dnl *** XMMS ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_XMMS, true)
+GST_CHECK_FEATURE(XMMS, [xmms plugin], xmms, [
+  AM_PATH_XMMS(0.1.0, HAVE_XMMS=yes, HAVE_XMMS=no)
 ])
 
 dnl Check for libghttp
@@ -908,7 +908,6 @@ AM_CONDITIONAL(HAVE_FIG2DEV_PNG,    $HAVE_FIG2DEV_PNG)
 AM_CONDITIONAL(HAVE_FIG2DEV_PDF,    $HAVE_FIG2DEV_PDF)
 AM_CONDITIONAL(HAVE_LIBRTP,         test "x$HAVE_LIBRTP" = "xyes")
 AM_CONDITIONAL(HAVE_ARTS,           test "x$HAVE_ARTS" = "xyes")
-AM_CONDITIONAL(HAVE_XMMS,           test "x$HAVE_XMMS" = "xyes")
 AM_CONDITIONAL(HAVE_RAW1394,        test "x$HAVE_RAW1394" = "xyes")
 AM_CONDITIONAL(HAVE_LIBDV,          test "x$HAVE_LIBDV" = "xyes")
 AM_CONDITIONAL(HAVE_GNOME_VFS,      test "x$HAVE_GNOME_VFS" = "xyes")
@@ -1078,6 +1077,7 @@ ext/openquicktime/Makefile
 ext/shout/Makefile
 ext/sdl/Makefile
 ext/vorbis/Makefile
+ext/xmms/Makefile
 gst-libs/Makefile
 gst-libs/gst/Makefile
 gst-libs/gst/audio/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index d5c74f0d93..39cddbf53c 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -119,12 +119,19 @@ else
 VORBIS_DIR=
 endif
 
+if USE_XMMS
+XMMS_DIR=xmms
+else
+XMMS_DIR=
+endif
+
 SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) \
 	$(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DVDREAD_DIR) $(ESD_DIR) \
         $(FESTIVAL_DIR) $(FLAC_DIR) $(GSM_DIR) $(HERMES_DIR) \
 	$(JPEG_DIR) $(LAME_DIR) $(MAD_DIR) $(MPEG2DEC_DIR) \
-	$(OPENQUICKTIME_DIR) $(SDL_DIR) $(SHOUT_DIR) $(VORBIS_DIR)
+	$(OPENQUICKTIME_DIR) $(SDL_DIR) $(SHOUT_DIR) $(VORBIS_DIR) \
+	$(XMMS_DIR)
 
 DIST_SUBDIRS=a52 aalib alsa avifile audiofile cdparanoia dvdread esd \
 	     festival flac gsm hermes jpeg lame mad mpeg2dec \
-	     openquicktime sdl shout vorbis
+	     openquicktime sdl shout vorbis xmms