diff options
| -rw-r--r-- | TODO | 6 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | ext/Makefile.am | 11 |
3 files changed, 19 insertions, 8 deletions
@@ -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 61e40d98..996acac9 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 d5c74f0d..39cddbf5 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 |