diff options
-rw-r--r-- | TODO | 5 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | ext/Makefile.am | 30 |
3 files changed, 33 insertions, 6 deletions
@@ -31,3 +31,8 @@ * make sidplay stuff ok, the source is on the net ;) * fix xmms plugin, doesn't register atm + +* arts and artsd need a good onceover + + +* check if we can drop some of the AC_SUBST's for libs and cflags diff --git a/configure.ac b/configure.ac index 996acac9..0d4dc5fb 100644 --- a/configure.ac +++ b/configure.ac @@ -545,6 +545,7 @@ dnl *** raw1394 *** translit(dnm, m, l) AM_CONDITIONAL(USE_RAW1394, true) GST_CHECK_FEATURE(RAW1394, [raw1394 library], dv1394src, [ GST_CHECK_LIBHEADER(RAW1394, raw1934, raw1934_get_handle,, libraw1394/raw1394.h, RAW1394_LIBS="-raw1394") + AC_SUBST(RAW1394_LIBS) ]) dnl Check for librtp @@ -1067,6 +1068,7 @@ ext/cdparanoia/Makefile ext/dvdread/Makefile ext/esd/Makefile ext/flac/Makefile +ext/gnomevfs/Makefile ext/gsm/Makefile ext/hermes/Makefile ext/jpeg/Makefile @@ -1074,6 +1076,8 @@ ext/lame/Makefile ext/mad/Makefile ext/mpeg2dec/Makefile ext/openquicktime/Makefile +ext/raw1394/Makefile +ext/rtp/Makefile ext/shout/Makefile ext/sdl/Makefile ext/vorbis/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index bc223d5b..52576c89 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -34,6 +34,12 @@ else CDPARANOIA_DIR= endif +if USE_DV +DV_DIR=dv +else +DV_DIR= +endif + if USE_DVDREAD DVDREAD_DIR=dvdread else @@ -64,6 +70,12 @@ else FLAC_DIR= endif +if USE_GNOME_VFS +GNOME_VFS_DIR=gnomevfs +else +GNOME_VFS_DIR= +endif + if USE_HERMES HERMES_DIR=hermes else @@ -106,6 +118,12 @@ else OPENQUICKTIME_DIR= endif +if USE_RTP +RTP_DIR=rtp +else +RTP_DIR= +endif + if USE_SDL SDL_DIR=sdl else @@ -131,12 +149,12 @@ 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) \ + $(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DV_DIR) $(DVDREAD_DIR) $(ESD_DIR) \ + $(FESTIVAL_DIR) $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) $(HERMES_DIR) \ $(JPEG_DIR) $(LAME_DIR) $(MAD_DIR) $(MIKMOD_DIR) $(MPEG2DEC_DIR) \ - $(OPENQUICKTIME_DIR) $(SDL_DIR) $(SHOUT_DIR) $(VORBIS_DIR) \ + $(OPENQUICKTIME_DIR) $(RTP_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 mikmod mpeg2dec \ - openquicktime sdl shout vorbis xmms +DIST_SUBDIRS=a52 aalib alsa avifile audiofile cdparanoia dv dvdread esd \ + festival flac gnomevfs gsm hermes jpeg lame mad mikmod mpeg2dec \ + openquicktime rtp sdl shout vorbis xmms |