libdv build fixes

Original commit message from CVS:
libdv build fixes

diff --git a/configure.ac b/configure.ac
index cb02fc6..cfc7464 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -450,12 +450,13 @@ dnl AC_CHECK_LIB(cdda_paranoia, paranoia_init, : , HAVE_CDPARANOIA=no, -lcdda_in
 dnl AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
 
 dnl *** libdv ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_DV, true)
-GST_CHECK_FEATURE(DV, [libdv DV/video decoder], dvdec, [
-  dnl use pkg-config when gtk deps are removed from its pkg-config .pc
-  AM_PATH_LIBDV(HAVE_DV="yes", HAVE_DV="no")
-  AC_SUBST(DV_CFLAGS)
-  AC_SUBST(DV_LIBS)
+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 ***
@@ -843,8 +844,6 @@ AM_CONDITIONAL(EXPERIMENTAL,        test "$EXPERIMENTAL" = "$xyes")
 AM_CONDITIONAL(BROKEN,              test "$BROKEN" = "$xyes")
 
 AM_CONDITIONAL(HAVE_NASM,           test "x$HAVE_NASM" = "xyes")
-AM_CONDITIONAL(HAVE_LIBGLADE_GNOME, test "x$HAVE_LIBGLADE_GNOME" = "xyes")
-AM_CONDITIONAL(HAVE_GNOME,          test "x$HAVE_GNOME" = "xyes")
 AM_CONDITIONAL(HAVE_GTK,            test "x$HAVE_GTK" = "xyes")
 AM_CONDITIONAL(HAVE_GTK_DOC,        $HAVE_GTK_DOC)
 AM_CONDITIONAL(BUILD_DOCS,          test "x$BUILD_DOCS" = "xyes")

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 2e9f799..46ba06d 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -46,12 +46,6 @@ else
 CDPARANOIA_DIR=
 endif
 
-if USE_DV
-LIBDV_DIR=dv
-else
-LIBDV_DIR=
-endif
-
 if USE_DVDREAD
 DVDREAD_DIR=dvdread
 else
@@ -136,6 +130,12 @@ else
 LCS_DIR=
 endif
 
+if USE_LIBDV
+LIBDV_DIR=dv
+else
+LIBDV_DIR=
+endif
+
 if USE_LIBFAME
 LIBFAME_DIR=libfame
 else
@@ -228,11 +228,11 @@ endif
 
 SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
         $(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \
-       $(AVIFILE_DIR) $(CDPARANOIA_DIR) $(LIBDV_DIR) \
+       $(AVIFILE_DIR) $(CDPARANOIA_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) $(LIBFAME_DIR) \
+       $(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) $(LIBDV_DIR) $(LIBFAME_DIR) \
        $(MAD_DIR) $(MIKMOD_DIR) $(MJPEGTOOLS_DIR) $(MPEG2DEC_DIR) \
        $(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \
        $(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \