summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2003-01-08 16:41:27 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2003-01-08 16:41:27 +0000
commit762db341097fb275acaac5b9030d25d4c659b10b (patch)
treed184a02ab61c03b68c8cc3d61d849b26bc22d871 /configure.ac
parent1f361e72b215de57e4c55994180882ca1de4b555 (diff)
downloadgst-plugins-bad-762db341097fb275acaac5b9030d25d4c659b10b.tar.gz
gst-plugins-bad-762db341097fb275acaac5b9030d25d4c659b10b.tar.bz2
gst-plugins-bad-762db341097fb275acaac5b9030d25d4c659b10b.zip
merge back from release
Original commit message from CVS: merge back from release
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac5
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 59d6d302..4ad07ad1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -529,12 +529,13 @@ GST_CHECK_FEATURE(FFMPEG, [ffmpeg plug-ins], ffmpeg, [
AC_MSG_NOTICE(slurping FFmpeg CVS source)
AS_SLURP_FFMPEG(gst-libs/ext/ffmpeg, 2002-12-14 12:00 GMT,
HAVE_FFMPEG=yes, HAVE_FFMPEG=no)
- AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, 1,
- [defined if we use uninstalled ffmpeg])
else
AC_MSG_NOTICE(FFmpeg CVS code should be included already)
HAVE_FFMPEG=yes
fi
+ # we only bother with uninstalled (included) ffmpeg for now
+ AC_DEFINE_UNQUOTED(HAVE_FFMPEG_UNINSTALLED, 1,
+ [defined if we use uninstalled ffmpeg])
])
dnl *** Gnome VFS ***