summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2003-01-06 23:10:12 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2003-01-06 23:10:12 +0000
commita9a26f6884578bc08f3182d1570ee560376162ab (patch)
tree98afbf1a908568f73273f2c5780273da8e1df9ac
parent115558ff48a7cbc446d9e55bd5b7e2fdb1b786c4 (diff)
downloadgstreamer-plugins-bad-a9a26f6884578bc08f3182d1570ee560376162ab.tar.gz
ffmpeg build fix new prerelease
Original commit message from CVS: ffmpeg build fix new prerelease
-rw-r--r--configure.ac7
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 24c0f3f33..0705c4d1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AM_MAINTAINER_MODE
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
-AS_VERSION(gst-plugins, GST_PLUGINS_VERSION, 0, 5, 0, 2, GST_ERROR="-Wall", GST_ERROR="-Wall -Werror")
+AS_VERSION(gst-plugins, GST_PLUGINS_VERSION, 0, 5, 0, 3, GST_ERROR="-Wall", GST_ERROR="-Wall -Werror")
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
dnl our libraries and install dirs use major.minor as a version
@@ -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 ***