mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

libdv build fixes

Browse source 
Original commit message from CVS:
libdv build fixes
This commit is contained in:
David I. Lehn 2002-08-09 21:14:55 +00:00
parent 469ff8a199
commit 0be19ec8c4
2 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
configure.ac
View file

@ -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 AC_CHECK_HEADER(cdda_paranoia.h, :, HAVE_CDPARANOIA=no)
dnl *** libdv *** dnl *** libdv ***
translit(dnm, m, l) AM_CONDITIONAL(USE_DV, true) translit(dnm, m, l) AM_CONDITIONAL(USE_LIBDV, true)
GST_CHECK_FEATURE(DV, [libdv DV/video decoder], dvdec, [ GST_CHECK_FEATURE(LIBDV, [libdv DV/video decoder], dvdec, [
dnl use pkg-config when gtk deps are removed from its pkg-config .pc dnl use this when gtk deps are removed from its pkg-config .pc
AM_PATH_LIBDV(HAVE_DV="yes", HAVE_DV="no") dnl PKG_CHECK_MODULES(LIBDV, libdv, HAVE_LIBDV="yes", HAVE_LIBDV="no")
AC_SUBST(DV_CFLAGS) AM_PATH_LIBDV(HAVE_LIBDV="yes", HAVE_LIBDV="no")
AC_SUBST(DV_LIBS) AC_SUBST(LIBDV_CFLAGS)
AC_SUBST(LIBDV_LIBS)
]) ])
dnl *** dvdread *** dnl *** dvdread ***
@ -843,8 +844,6 @@ AM_CONDITIONAL(EXPERIMENTAL, test "$EXPERIMENTAL" = "$xyes")
AM_CONDITIONAL(BROKEN, test "$BROKEN" = "$xyes") AM_CONDITIONAL(BROKEN, test "$BROKEN" = "$xyes")
AM_CONDITIONAL(HAVE_NASM, test "x$HAVE_NASM" = "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, test "x$HAVE_GTK" = "xyes")
AM_CONDITIONAL(HAVE_GTK_DOC, $HAVE_GTK_DOC) AM_CONDITIONAL(HAVE_GTK_DOC, $HAVE_GTK_DOC)
AM_CONDITIONAL(BUILD_DOCS, test "x$BUILD_DOCS" = "xyes") AM_CONDITIONAL(BUILD_DOCS, test "x$BUILD_DOCS" = "xyes")

16
ext/Makefile.am
View file

@ -46,12 +46,6 @@ else
CDPARANOIA_DIR= CDPARANOIA_DIR=
endif endif
if USE_DV
LIBDV_DIR=dv
else
LIBDV_DIR=
endif
if USE_DVDREAD if USE_DVDREAD
DVDREAD_DIR=dvdread DVDREAD_DIR=dvdread
else else
@ -136,6 +130,12 @@ else
LCS_DIR= LCS_DIR=
endif endif
if USE_LIBDV
LIBDV_DIR=dv
else
LIBDV_DIR=
endif
if USE_LIBFAME if USE_LIBFAME
LIBFAME_DIR=libfame LIBFAME_DIR=libfame
else else
@ -228,11 +228,11 @@ endif
SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \
$(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \ $(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \
$(AVIFILE_DIR) $(CDPARANOIA_DIR) $(LIBDV_DIR) \ $(AVIFILE_DIR) $(CDPARANOIA_DIR) \
$(DVDREAD_DIR) $(DVDNAV_DIR) $(ESD_DIR) \ $(DVDREAD_DIR) $(DVDNAV_DIR) $(ESD_DIR) \
$(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \ $(FLAC_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \
$(HERMES_DIR) $(HTTP_DIR) $(JACK_DIR) $(JPEG_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) \ $(MAD_DIR) $(MIKMOD_DIR) $(MJPEGTOOLS_DIR) $(MPEG2DEC_DIR) \
$(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \ $(OPENQUICKTIME_DIR) $(RAW1394_DIR) $(RTP_DIR) \
$(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \ $(SDL_DIR) $(SHOUT_DIR) $(SIDPLAY_DIR) \