From aaeb23ccc86aee72363b5dafe382375a3d1a0431 Mon Sep 17 00:00:00 2001
From: "David I. Lehn" <dlehn@users.sourceforge.net>
Date: Fri, 5 Jul 2002 10:17:09 +0000
Subject: attempt to fix my sucky dv and festival breakage.

Original commit message from CVS:
attempt to fix my sucky dv and festival breakage.
---
 configure.ac       | 14 ++++++++------
 ext/Makefile.am    | 12 ++++++------
 ext/dv/Makefile.am |  4 ++--
 m4/libdv.m4        |  2 +-
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index 85c9e27e..a312f240 100644
--- 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 32f9741e..d22c65fd 100644
--- 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/ext/dv/Makefile.am b/ext/dv/Makefile.am
index f2e66937..e93141cb 100644
--- a/ext/dv/Makefile.am
+++ b/ext/dv/Makefile.am
@@ -3,8 +3,8 @@ plugindir = $(libdir)/gst
 plugin_LTLIBRARIES = libgstdvdec.la
 
 libgstdvdec_la_SOURCES = gstdvdec.c
-libgstdvdec_la_CFLAGS = $(GST_CFLAGS) $(DV_CFLAGS)
-libgstdvdec_la_LIBADD = $(DV_LIBS) 
+libgstdvdec_la_CFLAGS = $(GST_CFLAGS) $(LIBDV_CFLAGS)
+libgstdvdec_la_LIBADD = $(LIBDV_LIBS) 
 libgstdvdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
 noinst_HEADERS = gstdvdec.h
diff --git a/m4/libdv.m4 b/m4/libdv.m4
index d0eee8a3..ca35db0b 100644
--- 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"
-- 
cgit