mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-08 18:39:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

only slurp in cvs mode

Browse source 
Original commit message from CVS:
only slurp in cvs mode
This commit is contained in:
Thomas Vander Stichele 2003-01-05 11:53:32 +00:00
parent 9a12767133
commit 9f97e219dc
3 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common

@ -1 +1 @@
Subproject commit 4a7bc52a893bdd9fefa9fabe460c827822a9e0f2 Subproject commit 2a7d1c564cbf64d94cb04fb8615afb761e89f80c

15
configure.ac
View file

@ -523,10 +523,18 @@ GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flacenc flacdec, [
dnl *** FFMPEG *** dnl *** FFMPEG ***
translit(dnm, m, l) AM_CONDITIONAL(USE_FFMPEG, true) translit(dnm, m, l) AM_CONDITIONAL(USE_FFMPEG, true)
GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [ GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [
# only slurp in the case where we are in CVS mode;
# prerelease and release should get it disted
if test "x$GST_PLUGINS_VERSION_NANO" = x1; then
AC_MSG_NOTICE(slurping FFmpeg CVS source)
AS_SLURP_FFMPEG(gst-libs/ext/ffmpeg, "2002-12-14 12:00 GMT", AS_SLURP_FFMPEG(gst-libs/ext/ffmpeg, "2002-12-14 12:00 GMT",
HAVE_FFMPEG=yes, HAVE_FFMPEG=no) HAVE_FFMPEG=yes, HAVE_FFMPEG=no)
AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, 1, AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, 1,
[defined if we use uninstalled ffmpeg]) [defined if we use uninstalled ffmpeg])
else
AC_MSG_NOTICE(FFmpeg CVS code should be included already)
HAVE_FFMPEG=yes
fi
]) ])
dnl *** Gnome VFS *** dnl *** Gnome VFS ***
@ -961,6 +969,13 @@ GST_CFLAGS="$GST_CFLAGS -I\$(top_srcdir)/gst-libs $GST_ERROR"
AC_SUBST(GST_LIBS) AC_SUBST(GST_LIBS)
AC_SUBST(GST_CFLAGS) AC_SUBST(GST_CFLAGS)
dnl ###########################
dnl # Configure external libs #
dnl ###########################
if test "x$HAVE_FFMPEG" = xyes; then
AC_CONFIG_SUBDIRS(gst-libs/ext/ffmpeg/ffmpeg)
fi
dnl ######################### dnl #########################
dnl # Make the output files # dnl # Make the output files #
dnl ######################### dnl #########################

2
gst-libs/ext/ffmpeg/Makefile.am
View file

@ -1,4 +1,4 @@
REVISION = EXTRA_DIST = Tag
# this doesn't trigger the distdir target in the ffmpeg checkout # this doesn't trigger the distdir target in the ffmpeg checkout
DIST_SUBDIRS = DIST_SUBDIRS =