attempt to fix my sucky dv and festival breakage.

Original commit message from CVS:
attempt to fix my sucky dv and festival breakage.

diff --git a/configure.ac b/configure.ac
index 85c9e27ebd0686e28c8401a3e64e7ddbf7b86cb0..a312f24036306385b2179054d0b3f66c23e3543f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -403,12 +403,14 @@ dnl FIXME : add second check somehow if that is necessary
 dnl AC_CHECK_LIB(cdda_paranoia, paranoia_init, : , HAVE_CDPARANOIA=no, -lcdda_interface )
 dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
 
-dnl *** dv ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_DV, true)
-GST_CHECK_FEATURE(DV, [libdv DV/video decoder], dvdec, [
-  PKG_CHECK_MODULES(DV, libdv, HAVE_DV="yes", HAVE_DV="no")
-  AC_SUBST(DV_CFLAGS)
-  AC_SUBST(DV_LIBS)
+dnl *** libdv ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_LIBDV, true)
+GST_CHECK_FEATURE(LIBDV, [libdv DV/video decoder], dvdec, [
+  dnl use this when gtk deps are removed from its pkg-config .pc
+  dnl PKG_CHECK_MODULES(LIBDV, libdv, HAVE_LIBDV="yes", HAVE_LIBDV="no")
+  AM_PATH_LIBDV(HAVE_LIBDV="yes", HAVE_LIBDV="no")
+  AC_SUBST(LIBDV_CFLAGS)
+  AC_SUBST(LIBDV_LIBS)
 ])
 
 dnl *** dvdread ***

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 32f9741ebcca2d7de3de59e44c37ff5f0ca32e7a..d22c65fde7daaffd8086257bc255699a0522f49e 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -46,10 +46,10 @@ else
 CDPARANOIA_DIR=
 endif
 
-if USE_DV
-DV_DIR=dv
+if USE_LIBDV
+LIBDV_DIR=dv
 else
-DV_DIR=
+LIBDV_DIR=
 endif
 
 if USE_DVDREAD
@@ -228,9 +228,9 @@ endif
 
 SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
         $(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \
-       $(AVIFILE_DIR) $(CDPARANOIA_DIR) $(DV_DIR) \
+       $(AVIFILE_DIR) $(CDPARANOIA_DIR) $(LIBDV_DIR) \
        $(DVDREAD_DIR) $(DVDNAV_DIR) $(ESD_DIR) \
-       $(FESTIVAL_DIR) $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
+       $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
        $(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_DIR) \
        $(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) $(LIBFAME_DIR) \
        $(MAD_DIR) $(MIKMOD_DIR) $(MJPEGTOOLS_DIR) $(MPEG2DEC_DIR) \
@@ -242,7 +242,7 @@ DIST_SUBDIRS=\
        a52dec aalib alsa \
        arts artsd avifile \
        audiofile cdparanoia dv \
-       dvdread dvdnav esd festival ffmpeg \
+       dvdread dvdnav esd ffmpeg \
        flac gnomevfs gsm \
        hermes http jack jpeg \
        ladspa lame lcs libfame \

diff --git a/m4/libdv.m4 b/m4/libdv.m4
index d0eee8a3818110ce69b3db06e6d165a94cfaae2d..ca35db0bdb935beb5bf425528ba4c14f39d388b1 100644 (file)
--- a/m4/libdv.m4
+++ b/m4/libdv.m4
@@ -23,7 +23,7 @@ AC_ARG_ENABLE(libdvtest, [  --disable-libdvtest       Do not try to compile and
     LIBDV_LIBS="-L$prefix/lib"
   fi
 
-  LIBDV_LIBS="$LIBDV_LIBS -ldv"
+  LIBDV_LIBS="$LIBDV_LIBS -ldv -lm"
 
   if test "x$libdv_includes" != "x" ; then
     LIBDV_CFLAGS="-I$libdv_includes"