From fd1648849bda6b8d67e4cb3da5a35d69aa515639 Mon Sep 17 00:00:00 2001 From: "David I. Lehn" Date: Sun, 26 May 2002 17:39:45 +0000 Subject: [PATCH] rename dvdsrc to dvdreadsrc add libdvdnav support as dvdnavsrc plugin Original commit message from CVS: rename dvdsrc to dvdreadsrc add libdvdnav support as dvdnavsrc plugin --- configure.ac | 11 ++++++++++- ext/Makefile.am | 10 ++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 47fe33a582..bf655b9fe8 100644 --- a/configure.ac +++ b/configure.ac @@ -372,11 +372,19 @@ GST_CHECK_FEATURE(DV, [dv library], dv, [ dnl *** dvdread *** translit(dnm, m, l) AM_CONDITIONAL(USE_DVDREAD, true) -GST_CHECK_FEATURE(DVDREAD, [dvdread library], dvdsrc, [ +GST_CHECK_FEATURE(DVDREAD, [dvdread library], dvdreadsrc, [ GST_CHECK_LIBHEADER(DVDREAD, dvdread, DVDOpen, , dvdread/dvd_reader.h, DVDREAD_LIBS="-ldvdread") AC_SUBST(DVDREAD_LIBS) ]) +dnl *** dvdnav *** +translit(dnm, m, l) AM_CONDITIONAL(USE_DVDNAV, true) +GST_CHECK_FEATURE(DVDNAV, [dvdnav library], dvdnavsrc, [ + translit(dnm, m, l) AC_SUBST(DVDNAV_LIBS) + translit(dnm, m, l) AC_SUBST(DVDNAV_CFLAGS) + GST_CHECK_CONFIGPROG(DVDNAV, dvdnav-config) +]) + dnl **** ESound **** translit(dnm, m, l) AM_CONDITIONAL(USE_ESD, true) GST_CHECK_FEATURE(ESD, [esound plugins], esdsink esdmon, [ @@ -831,6 +839,7 @@ ext/avifile/Makefile ext/cdparanoia/Makefile ext/dv/Makefile ext/dvdread/Makefile +ext/dvdnav/Makefile ext/esd/Makefile ext/ffmpeg/Makefile ext/flac/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index dfc17a09bc..970f97a381 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -58,6 +58,12 @@ else DVDREAD_DIR= endif +if USE_DVDNAV +DVDNAV_DIR=dvdnav +else +DVDNAV_DIR= +endif + if USE_ESD ESD_DIR=esd else @@ -213,7 +219,7 @@ endif SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \ $(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \ $(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DV_DIR) \ - $(DVDREAD_DIR) $(ESD_DIR) \ + $(DVDREAD_DIR) $(DVDNAV_DIR) $(ESD_DIR) \ $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \ $(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_DIR) \ $(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) \ @@ -226,7 +232,7 @@ DIST_SUBDIRS=\ a52dec aalib alsa \ arts artsd avifile \ audiofile cdparanoia dv \ - dvdread esd ffmpeg \ + dvdread dvdnav esd ffmpeg \ flac gnomevfs gsm \ hermes http jack jpeg \ ladspa lame lcs \